diff --git a/src/game/g_basic.pas b/src/game/g_basic.pas
index 8e1ae926769f02fa83676e5a685bd9274417d124..1ed87abd9145fba8dbf04b0875b590d38dbb7d2f 100644 (file)
--- a/src/game/g_basic.pas
+++ b/src/game/g_basic.pas
-(* Copyright (C) DooM 2D:Forever Developers
+(* Copyright (C) Doom 2D: Forever Developers
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
interface
uses
- wadreader, g_phys;
+ utils, g_phys;
const
GAME_VERSION = '0.667';
+ GAME_BUILDDATE = {$I %DATE%};
+ GAME_BUILDTIME = {$I %TIME%};
UID_GAME = 1;
UID_PLAYER = 2;
UID_MONSTER = 3;
function g_CreateUID(UIDType: Byte): Word;
function g_GetUIDType(UID: Word): Byte;
function g_Collide(X1, Y1: Integer; Width1, Height1: Word;
- X2, Y2: Integer; Width2, Height2: Word): Boolean;
+ X2, Y2: Integer; Width2, Height2: Word): Boolean; inline;
function g_CollideLine(x1, y1, x2, y2, rX, rY: Integer; rWidth, rHeight: Word): Boolean;
-function g_CollidePoint(X, Y, X2, Y2: Integer; Width, Height: Word): Boolean;
-function g_CollideLevel(X, Y: Integer; Width, Height: Word): Boolean;
+function g_CollidePoint(X, Y, X2, Y2: Integer; Width, Height: Word): Boolean; inline;
+function g_CollideLevel(X, Y: Integer; Width, Height: Word): Boolean; inline;
function g_CollideAround(X1, Y1: Integer; Width1, Height1: Word;
- X2, Y2: Integer; Width2, Height2: Word): Boolean;
-function g_CollidePlayer(X, Y: Integer; Width, Height: Word): Boolean;
+ X2, Y2: Integer; Width2, Height2: Word): Boolean; inline;
+function g_CollidePlayer(X, Y: Integer; Width, Height: Word): Boolean; inline;
function g_PatchLength(X1, Y1, X2, Y2: Integer): Word;
function g_TraceVector(X1, Y1, X2, Y2: Integer): Boolean; // `true`: no wall hit
function g_GetAcidHit(X, Y: Integer; Width, Height: Word): Byte;
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;
+function b_Text_Wrap(S: string; LineLen: Integer): string;
+function b_Text_LineCount(S: string): Integer;
+
+var
+ gmon_dbg_los_enabled: Boolean = true;
implementation
uses
- Math, g_map, g_gfx, g_player, SysUtils, MAPDEF,
- StrUtils, e_graphics, g_monsters, g_items;
+ 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;
begin
Result := Min(Round(Hypot(Abs(X2-X1), Abs(Y2-Y1))), 65535);
end;
-function g_CollideLevel(X, Y: Integer; Width, Height: Word): Boolean;
+function g_CollideLevel(X, Y: Integer; Width, Height: Word): Boolean; inline;
begin
result := g_Map_CollidePanel(X, Y, Width, Height, (PANEL_WALL or PANEL_CLOSEDOOR or PANEL_OPENDOOR), false);
end;
end;
*)
-function g_CollidePlayer(X, Y: Integer; Width, Height: Word): Boolean;
+function g_CollidePlayer(X, Y: Integer; Width, Height: Word): Boolean; inline;
var
a: Integer;
begin
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;
Result := True;
*)
- if (g_Map_traceToNearestWall(x1, y1, x2, y2, @wallHitX, @wallHitY) >= 0) then
- begin
- // check distance
- //result := ((wallHitX-x1)*(wallHitX-x1)+(wallHitY-y1)*(wallHitY-y1) > (x2-x1)*(x2-x1)+(y2-y1)*(y2-y1));
- result := false;
- end
- else
- begin
- result := true; // no obstacles
- end;
+ // `true` if no obstacles
+ if (g_profile_los) then g_Mons_LOS_Start();
+ result := (g_Map_traceToNearestWall(x1, y1, x2, y2, @wallHitX, @wallHitY) = nil);
+ if (g_profile_los) then g_Mons_LOS_End();
end;
end;
function g_Collide(X1, Y1: Integer; Width1, Height1: Word;
- X2, Y2: Integer; Width2, Height2: Word): Boolean;
+ X2, Y2: Integer; Width2, Height2: Word): Boolean; inline;
begin
Result := not ( ((Y1 + Height1 <= Y2) or
(Y2 + Height2 <= Y1)) or
end;
function g_CollideAround(X1, Y1: Integer; Width1, Height1: Word;
- X2, Y2: Integer; Width2, Height2: Word): Boolean;
+ X2, Y2: Integer; Width2, Height2: Word): Boolean; inline;
begin
Result := g_Collide(X1, Y1, Width1, Height1, X2, Y2, Width2, Height2) or
g_Collide(X1+1, Y1, Width1, Height1, X2, Y2, Width2, Height2) or
g_Collide(X1, Y1-1, Width1, Height1, X2, Y2, Width2, Height2);
end;
-function c(X1, Y1, Width1, Height1, X2, Y2, Width2, Height2: Integer): Boolean;
+function c(X1, Y1, Width1, Height1, X2, Y2, Width2, Height2: Integer): Boolean; inline;
begin
Result := not (((Y1 + Height1 <= Y2) or
(Y1 >= Y2 + Height2)) or
(X1 >= X2 + Width2)));
end;
-function g_Collide2(X1, Y1, X2, Y2, X3, Y3, X4, Y4: Integer): Boolean;
+function g_Collide2(X1, Y1, X2, Y2, X3, Y3, X4, Y4: Integer): Boolean; inline;
begin
//Result := not (((Y2 <= Y3) or (Y1 >= Y4)) or ((X2 <= X3) or (X1 >= X4)));
Result := c(X1, Y1, X2-X1, Y2-Y1, X3, Y3, X4-X3, Y4-Y3);
end;
-function g_CollidePoint(X, Y, X2, Y2: Integer; Width, Height: Word): Boolean;
+function g_CollidePoint(X, Y, X2, Y2: Integer; Width, Height: Word): Boolean; inline;
begin
X := X-X2;
Y := Y-Y2;
function g_Look(a, b: PObj; d: TDirection): Boolean;
begin
- if ((b^.X > a^.X) and (d = D_LEFT)) or
- ((b^.X < a^.X) and (d = D_RIGHT)) then
+ if not gmon_dbg_los_enabled then begin result := false; exit; end; // always "wall hit"
+
+ 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;
-var
- a: Integer;
- b: array of string;
- str: string;
+function GetLines (Text: string; FontID: DWORD; MaxWidth: Word): SSArray;
+ var i, j, len, lines: Integer; w, cw, ch: Word; skip: Boolean;
begin
- Text := Trim(Text);
-
- while Pos(' ', Text) <> 0 do Text := AnsiReplaceStr(Text, ' ', ' ');
-
- while Text <> '' do
- begin
- SetLength(b, Length(b)+1);
- b[High(b)] := GetStr(Text);
- end;
-
- a := 0;
- while True do
- begin
- if a > High(b) then Break;
-
- str := b[a];
- a := a+1;
-
- if Length(str) >= MaxChars then
+ result := nil; lines := 0; w := 0;
+ j := 1; i := 1; len := Length(Text);
+ while i <= len do
begin
- while str <> '' do
- begin
- SetLength(Result, Length(Result)+1);
- Result[High(Result)] := Copy(str, 1, MaxChars);
- Delete(str, 1, MaxChars);
- end;
-
- Continue;
- end;
-
- while (a <= High(b)) and (Length(str+' '+b[a]) <= MaxChars) do
- begin
- str := str+' '+b[a];
- a := a+1;
- end;
-
- SetLength(Result, Length(Result)+1);
- Result[High(Result)] := str;
- end;
-end;}
-
-function GetLines(Text: string; FontID: DWORD; MaxWidth: Word): SArray;
-
-function TextLen(Text: string): Word;
-var
- h: Word;
-begin
- e_CharFont_GetSize(FontID, Text, Result, h);
-end;
-
-var
- a, c: Integer;
- b: array of string;
- str: string;
-begin
- SetLength(Result, 0);
- SetLength(b, 0);
-
- Text := Trim(Text);
-
-// Óäàëÿåì ìíîæåñòâåííûå ïðîáåëû:
- while Pos(' ', Text) <> 0 do
- Text := AnsiReplaceStr(Text, ' ', ' ');
-
- while Text <> '' do
- begin
- SetLength(b, Length(b)+1);
- b[High(b)] := GetStr(Text);
- end;
-
- a := 0;
- while True do
- begin
- if a > High(b) then
- Break;
-
- str := b[a];
- a := a+1;
-
- if TextLen(str) > MaxWidth then
- begin // Òåêóùàÿ ñòðîêà ñëèøêîì äëèííàÿ => ðàçáèâàåì
- while str <> '' do
+ e_CharFont_GetSize(FontID, '' + Text[i], cw, ch);
+ if (i >= len) or (w + cw >= MaxWidth) then
+ begin
+ skip := (i < len) and (Text[i] <> ' ');
+ if skip then
begin
- SetLength(Result, Length(Result)+1);
-
- c := 0;
- while (c < Length(str)) and
- (TextLen(Copy(str, 1, c+1)) < MaxWidth) do
- c := c+1;
-
- Result[High(Result)] := Copy(str, 1, c);
- Delete(str, 1, c);
+ // alt: while (i >= j) and (Text[i] <> ' ') do Dec(i);
+ while (i <= len) and (Text[i] <> ' ') do Inc(i);
end;
- end
- else // Ñòðîêà íîðìàëüíîé äëèíû => ñîåäèíÿåì ñî ñëåäóþùèìè
- begin
- while (a <= High(b)) and
- (TextLen(str+' '+b[a]) < MaxWidth) do
+ while (i >= j) and (Text[i] = ' ') do Dec(i);
+ (* --- *)
+ SetLength(result, lines + 1);
+ result[lines] := Copy(Text, j, i - j + 1);
+ Inc(lines);
+ (* --- *)
+ if skip then
begin
- str := str+' '+b[a];
- a := a + 1;
+ while (i <= len) and (Text[i] = ' ') do Inc(i);
+ Inc(i);
end;
-
- SetLength(Result, Length(Result)+1);
- Result[High(Result)] := str;
+ j := i + 1;
+ w := 0
end;
+ Inc(w, cw);
+ Inc(i)
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;
end;
end;
+function b_Text_Wrap(S: string; LineLen: Integer): string;
+begin
+ Result := WrapText(S, ''#10, [#10, ' ', '-'], LineLen);
+end;
+
+function b_Text_LineCount(S: string): Integer;
+var
+ I: Integer;
+begin
+ Result := IfThen(S = '', 0, 1);
+ for I := 1 to High(S) do
+ if S[I] = #10 then
+ Inc(Result);
+end;
+
end.