diff --git a/src/game/g_basic.pas b/src/game/g_basic.pas
index 530bf8e4c2ea873385be3eb3403a548122bfdd8f..7df493fe4f248a8fe57ac8fb11da55c9713227b4 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
*
* 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
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
interface
uses
interface
uses
- wadreader, g_phys;
+ utils, g_phys;
const
GAME_VERSION = '0.667';
const
GAME_VERSION = '0.667';
+ GAME_BUILDDATE = {$I %DATE%};
+ GAME_BUILDTIME = {$I %TIME%};
UID_GAME = 1;
UID_PLAYER = 2;
UID_MONSTER = 3;
UID_GAME = 1;
UID_PLAYER = 2;
UID_MONSTER = 3;
DWArray = array of DWORD;
String20 = String[20];
DWArray = array of DWORD;
String20 = String[20];
+function g_GetBuilderName (): AnsiString;
+function g_GetBuildHash (full: Boolean = True): AnsiString;
+
function g_CreateUID(UIDType: Byte): Word;
function g_GetUIDType(UID: Word): Byte;
function g_Collide(X1, Y1: Integer; Width1, Height1: Word;
function g_CreateUID(UIDType: Byte): Word;
function g_GetUIDType(UID: Word): Byte;
function g_Collide(X1, Y1: Integer; Width1, Height1: Word;
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 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 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 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;
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_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;
var
gmon_dbg_los_enabled: Boolean = true;
implementation
uses
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;
StrUtils, e_graphics, g_monsters, g_items, g_game;
+{$PUSH}
+{$WARN 2054 OFF} // unknwon env var
+{$WARN 6018 OFF} // unreachable code
+function g_GetBuilderName (): AnsiString;
+begin
+ if {$I %D2DF_BUILD_USER%} <> '' then
+ result := {$I %D2DF_BUILD_USER%} // custom
+ else if {$I %USER%} <> '' then
+ result := {$I %USER%} // unix username
+ else if {$I %USERNAME%} <> '' then
+ result := {$I %USERNAME%} // windows username
+ else
+ result := 'unknown'
+end;
+
+function g_GetBuildHash (full: Boolean = True): AnsiString;
+begin
+ if {$I %D2DF_BUILD_HASH%} <> '' then
+ if full then
+ result := {$I %D2DF_BUILD_HASH%}
+ else
+ result := Copy({$I %D2DF_BUILD_HASH%}, 1, 7)
+ else
+ result := 'custom build'
+end;
+{$POP}
+
function g_PatchLength(X1, Y1, X2, Y2: Integer): Word;
begin
Result := Min(Round(Hypot(Abs(X2-X1), Abs(Y2-Y1))), 65535);
function g_PatchLength(X1, Y1, X2, Y2: Integer): Word;
begin
Result := Min(Round(Hypot(Abs(X2-X1), Abs(Y2-Y1))), 65535);
begin
if not gmon_dbg_los_enabled then begin result := false; exit; end; // always "wall hit"
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;
begin
Result := False;
Exit;
end;}
function g_CollideLine(x1, y1, x2, y2, rX, rY: Integer; rWidth, rHeight: Word): Boolean;
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;
var
i: Integer;
dx, dy: Integer;
Xerr, Yerr: Integer;
incX, incY: Integer;
x, y, d: Integer;
+}
begin
begin
+ result := lineAABBIntersects(x1, y1, x2, y2, rX, rY, rWidth, rHeight);
+{
Result := True;
Xerr := 0;
Result := True;
Xerr := 0;
end;
Result := False;
end;
Result := False;
+}
end;
function GetStr(var Str: string): string;
end;
function GetStr(var Str: string): string;
end;
end;
end;
end;
-{function GetLines(Text: string; MaxChars: Word): SArray;
-var
- a: Integer;
- b: array of string;
- str: string;
-begin
- Text := Trim(Text);
-
- while Pos(' ', Text) <> 0 do Text := AnsiReplaceStr(Text, ' ', ' ');
+function GetLines (Text: string; FontID: DWORD; MaxWidth: Word): SSArray;
+ var i, j, len, lines: Integer;
- 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
+ function GetLine (j, i: Integer): String;
begin
begin
- while str <> '' do
- begin
- SetLength(Result, Length(Result)+1);
- Result[High(Result)] := Copy(str, 1, MaxChars);
- Delete(str, 1, MaxChars);
- end;
-
- Continue;
+ result := Copy(text, j, i - j + 1);
end;
end;
- while (a <= High(b)) and (Length(str+' '+b[a]) <= MaxChars) do
+ function GetWidth (j, i: Integer): Integer;
+ var w, h: Word;
begin
begin
- str := str+' '+b[a];
- a := a+1;
+ e_CharFont_GetSize(FontID, GetLine(j, i), w, h);
+ result := w
end;
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
begin
- SetLength(Result, 0);
- SetLength(b, 0);
-
- Text := Trim(Text);
-
-// Óäàëÿåì ìíîæåñòâåííûå ïðîáåëû:
- while Pos(' ', Text) <> 0 do
- Text := AnsiReplaceStr(Text, ' ', ' ');
-
- while Text <> '' do
+ result := nil; lines := 0;
+ j := 1; i := 1; len := Length(Text);
+ // e_LogWritefln('GetLines @%s len=%s [%s]', [MaxWidth, len, Text]);
+ while j <= len do
begin
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
- 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);
- end;
- end
- else // Ñòðîêà íîðìàëüíîé äëèíû => ñîåäèíÿåì ñî ñëåäóþùèìè
- begin
- while (a <= High(b)) and
- (TextLen(str+' '+b[a]) < MaxWidth) do
- begin
- str := str+' '+b[a];
- a := a + 1;
- end;
-
- SetLength(Result, Length(Result)+1);
- Result[High(Result)] := str;
- end;
+ (* --- Get longest possible sequence --- *)
+ while (i + 1 <= len) and (GetWidth(j, i + 1) <= MaxWidth) do Inc(i);
+ (* --- Do not include part of word --- *)
+ if (i < len) and (text[i] <> ' ') then
+ while (i >= j) and (text[i] <> ' ') do Dec(i);
+ (* --- Do not include spaces --- *)
+ while (i >= j) and (text[i] = ' ') do Dec(i);
+ (* --- Add line --- *)
+ SetLength(result, lines + 1);
+ result[lines] := GetLine(j, i);
+ // e_LogWritefln(' -> (%s:%s::%s) [%s]', [j, i, GetWidth(j, i), result[lines]]);
+ Inc(lines);
+ (* --- Skip spaces --- *)
+ while (i <= len) and (text[i] = ' ') do Inc(i);
+ j := i + 2;
end;
end;
end;
end;
-procedure Sort(var a: SArray);
+procedure Sort(var a: SSArray);
var
i, j: Integer;
s: string;
var
i, j: Integer;
s: string;
end;
end;
end;
end;
-function InSArray(a: string; arr: SArray): Boolean;
+function InSArray(a: string; arr: SSArray): Boolean;
var
b: Integer;
begin
var
b: Integer;
begin
Result := True;
end;
Result := True;
end;
-function parse(s: String): SArray;
+function parse(s: String): SSArray;
var
a: Integer;
begin
var
a: Integer;
begin
end;
end;
end;
end;
-function parse2(s: string; delim: Char): SArray;
+function parse2(s: string; delim: Char): SSArray;
var
a: Integer;
begin
var
a: Integer;
begin
CloseFile(F);
end;
CloseFile(F);
end;
-procedure SortSArray(var S: SArray);
+procedure SortSArray(var S: SSArray);
var
b: Boolean;
i: Integer;
var
b: Boolean;
i: Integer;
end;
end;
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.
end.