diff --git a/src/game/g_basic.pas b/src/game/g_basic.pas
index 8069029bc2c8338113244ef0f753b50659652a5d..d82b285bf9f344afc9f906bb2c017f432916d055 100644 (file)
--- a/src/game/g_basic.pas
+++ b/src/game/g_basic.pas
interface
uses
- wadreader, g_phys;
+ utils, g_phys;
const
GAME_VERSION = '0.667';
function PointToRect(X, Y, X1, Y1: Integer; Width, Height: Word): Integer;
function GetAngle(baseX, baseY, pointX, PointY: Integer): SmallInt;
function GetAngle2(vx, vy: Integer): SmallInt;
-function GetLines(Text: string; FontID: DWORD; MaxWidth: Word): SArray;
-procedure Sort(var a: SArray);
+function GetLines(Text: string; FontID: DWORD; MaxWidth: Word): SSArray;
+procedure Sort(var a: SSArray);
function Sscanf(const s: string; const fmt: string;
const Pointers: array of Pointer): Integer;
function InDWArray(a: DWORD; arr: DWArray): Boolean;
function InWArray(a: Word; arr: WArray): Boolean;
-function InSArray(a: string; arr: SArray): Boolean;
+function InSArray(a: string; arr: SSArray): Boolean;
function GetPos(UID: Word; o: PObj): Boolean;
-function parse(s: string): SArray;
-function parse2(s: string; delim: Char): SArray;
+function parse(s: string): SSArray;
+function parse2(s: string; delim: Char): SSArray;
function g_GetFileTime(fileName: String): Integer;
function g_SetFileTime(fileName: String; time: Integer): Boolean;
-procedure SortSArray(var S: SArray);
+procedure SortSArray(var S: SSArray);
function b_Text_Format(S: string): string;
function b_Text_Unformat(S: string): string;
implementation
uses
- Math, e_log, g_map, g_gfx, g_player, SysUtils, MAPDEF,
+ Math, geom, e_log, g_map, g_gfx, g_player, SysUtils, MAPDEF,
StrUtils, e_graphics, g_monsters, g_items, g_game;
function g_PatchLength(X1, Y1, X2, Y2: Integer): Word;
if gPlayers = nil then Exit;
for a := 0 to High(gPlayers) do
- if (gPlayers[a] <> nil) and gPlayers[a].Live then
+ if (gPlayers[a] <> nil) and gPlayers[a].alive then
if gPlayers[a].Collide(X, Y, Width, Height) then
begin
Result := True;
begin
if not gmon_dbg_los_enabled then begin result := false; exit; end; // always "wall hit"
- if ((b^.X > a^.X) and (d = D_LEFT)) or
- ((b^.X < a^.X) and (d = D_RIGHT)) then
+ if ((b^.X > a^.X) and (d = TDirection.D_LEFT)) or
+ ((b^.X < a^.X) and (d = TDirection.D_RIGHT)) then
begin
Result := False;
Exit;
end;}
function g_CollideLine(x1, y1, x2, y2, rX, rY: Integer; rWidth, rHeight: Word): Boolean;
+{
var
i: Integer;
dx, dy: Integer;
Xerr, Yerr: Integer;
incX, incY: Integer;
x, y, d: Integer;
+}
begin
+ result := lineAABBIntersects(x1, y1, x2, y2, rX, rY, rWidth, rHeight);
+{
Result := True;
Xerr := 0;
end;
Result := False;
+}
end;
function GetStr(var Str: string): string;
end;
end;
-{function GetLines(Text: string; MaxChars: Word): SArray;
+{function GetLines(Text: string; MaxChars: Word): SSArray;
var
a: Integer;
b: array of string;
end;
end;}
-function GetLines(Text: string; FontID: DWORD; MaxWidth: Word): SArray;
+function GetLines(Text: string; FontID: DWORD; MaxWidth: Word): SSArray;
function TextLen(Text: string): Word;
var
end;
end;
-procedure Sort(var a: SArray);
+procedure Sort(var a: SSArray);
var
i, j: Integer;
s: string;
end;
end;
-function InSArray(a: string; arr: SArray): Boolean;
+function InSArray(a: string; arr: SSArray): Boolean;
var
b: Integer;
begin
begin
p := g_Player_Get(UID);
if p = nil then Exit;
- if not p.Live then Exit;
+ if not p.alive then Exit;
o^ := p.Obj;
end;
begin
m := g_Monsters_ByUID(UID);
if m = nil then Exit;
- if not m.Live then Exit;
+ if not m.alive then Exit;
o^ := m.Obj;
end;
Result := True;
end;
-function parse(s: String): SArray;
+function parse(s: String): SSArray;
var
a: Integer;
begin
end;
end;
-function parse2(s: string; delim: Char): SArray;
+function parse2(s: string; delim: Char): SSArray;
var
a: Integer;
begin
CloseFile(F);
end;
-procedure SortSArray(var S: SArray);
+procedure SortSArray(var S: SSArray);
var
b: Boolean;
i: Integer;