X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_basic.pas;h=ccfd5d91fdb489b4d539b07818b05a43ea1657ba;hb=63889e5f1141ac723de31ad23d8d3ca88438a76c;hp=530bf8e4c2ea873385be3eb3403a548122bfdd8f;hpb=a7daeef3855f07c8302a60ab31cb20ab74aefc45;p=d2df-sdl.git diff --git a/src/game/g_basic.pas b/src/game/g_basic.pas index 530bf8e..ccfd5d9 100644 --- a/src/game/g_basic.pas +++ b/src/game/g_basic.pas @@ -1,9 +1,8 @@ -(* 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 @@ -19,10 +18,12 @@ unit g_basic; 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; @@ -37,6 +38,10 @@ type DWArray = array of DWORD; String20 = String[20]; +function g_GetBuilderName (): AnsiString; +function g_GetBuildHash (full: Boolean = True): AnsiString; +function g_GetBuildArch (): AnsiString; + function g_CreateUID(UIDType: Byte): Word; function g_GetUIDType(UID: Word): Byte; function g_Collide(X1, Y1: Integer; Width1, Height1: Word; @@ -72,22 +77,23 @@ function Sign(A: Single): ShortInt; overload; 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; @@ -95,9 +101,120 @@ var 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; +{$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_GetBuildArch (): AnsiString; + var cpu, mode, fpu: AnsiString; +begin + {$IF DEFINED(CPUX86_64) OR DEFINED(CPUAMD64) OR DEFINED(CPUX64)} + cpu := 'x86_64'; + {$ELSEIF DEFINED(CPUI386) OR DEFINED(CPU386)} + cpu := 'x86'; + {$ELSEIF DEFINED(CPUI8086)} + cpu := 'i8086'; + {$ELSEIF DEFINED(CPUI64)} + cpu := 'Itanium64'; + {$ELSEIF DEFINED(CPUARM)} + cpu := 'ARM'; + {$ELSEIF DEFINED(CPUAVR)} + cpu := 'AVR'; + {$ELSEIF DEFINED(CPUPOWERPC32)} + cpu := 'PowerPC_32'; + {$ELSEIF DEFINED(CPUPOWERPC64)} + cpu := 'PowerPC_64'; + {$ELSEIF DEFINED(CPUALPHA)}} + cpu := 'Alpha'; + {$ELSEIF DEFINED(CPUSPARC32)} + cpu := 'Sparc32'; + {$ELSEIF DEFINED(CPUM68020)} + cpu := 'M68020'; + {$ELSEIF DEFINED(CPU68K) OR DEFINED(CPUM68K)} + cpu := 'm68k'; + {$ELSEIF DEFINED(CPUSPARC)} + cpu := 'unknown-sparc'; + {$ELSEIF DEFINED(CPUPOWERPC)} + cpu := 'unknown-ppc'; + {$ELSEIF DEFINED(CPU86) OR DEFINED(CPU87)} + cpu := 'unknown-intel'; + {$ELSE} + cpu := 'unknown-arch'; + {$ENDIF} + + {$IF DEFINED(CPU64)} + mode := '64-bit'; + {$ELSEIF DEFINED(CPU32)} + mode := '32-bit'; + {$ELSEIF DEFINED(CPU16)} + mode := '16-bit'; + {$ELSE} + mode := 'unknown-mode'; + {$ENDIF} + + {$IF DEFINED(FPUSOFT)} + fpu := 'soft'; + {$ELSEIF DEFINED(FPUSSE3)} + fpu := 'sse3'; + {$ELSEIF DEFINED(FPUSSE2)} + fpu := 'sse2'; + {$ELSEIF DEFINED(FPUSSE)} + fpu := 'sse'; + {$ELSEIF DEFINED(FPUSSE64)} + fpu := 'sse64'; + {$ELSEIF DEFINED(FPULIBGCC)} + fpu := 'libgcc'; + {$ELSEIF DEFINED(FPU68881)} + fpu := '68881'; + {$ELSEIF DEFINED(FPUVFP)} + fpu := 'vfp'; + {$ELSEIF DEFINED(FPUFPA11)} + fpu := 'fpa11'; + {$ELSEIF DEFINED(FPUFPA10)} + fpu := 'fpa10'; + {$ELSEIF DEFINED(FPUFPA)} + fpu := 'fpa'; + {$ELSEIF DEFINED(FPUX87)} + fpu := 'x87'; + {$ELSEIF DEFINED(FPUITANIUM)} + fpu := 'itanium'; + {$ELSEIF DEFINED(FPUSTANDARD)} + fpu := 'standard'; + {$ELSEIF DEFINED(FPUHARD)} + fpu := 'hard'; + {$ELSE} + fpu := 'unknown-fpu'; + {$ENDIF} + + result := cpu + ' ' + mode + ' ' + fpu; +end; + function g_PatchLength(X1, Y1, X2, Y2: Integer): Word; begin Result := Min(Round(Hypot(Abs(X2-X1), Abs(Y2-Y1))), 65535); @@ -454,8 +571,8 @@ function g_Look(a, b: PObj; d: TDirection): Boolean; 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; @@ -559,13 +676,17 @@ begin 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; @@ -604,6 +725,7 @@ begin end; Result := False; +} end; function GetStr(var Str: string): string; @@ -621,122 +743,66 @@ begin 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, ' ', ' '); - - 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; +function GetLines (text: string; FontID: DWORD; MaxWidth: Word): SSArray; + var + k: Integer = 1; + lines: Integer = 0; + i, len, lastsep: Integer; - if Length(str) >= MaxChars then + function PrepareStep (): Boolean; inline; begin - while str <> '' do - begin - SetLength(Result, Length(Result)+1); - Result[High(Result)] := Copy(str, 1, MaxChars); - Delete(str, 1, MaxChars); - end; - - Continue; + // Skip leading spaces. + while PChar(text)[k-1] = ' ' do k += 1; + Result := k <= len; + i := k; end; - while (a <= High(b)) and (Length(str+' '+b[a]) <= MaxChars) do + function GetLine (j: Integer; Strip: Boolean): String; inline; begin - str := str+' '+b[a]; - a := a+1; - end; - - SetLength(Result, Length(Result)+1); - Result[High(Result)] := str; - end; -end;} + // Exclude trailing spaces from the line. + if Strip then + while text[j] = ' ' do j -= 1; -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); + Result := Copy(text, k, j-k+1); end; - a := 0; - while True do + function LineWidth (): Integer; inline; + var w, h: Word; 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; + e_CharFont_GetSize(FontID, GetLine(i, False), w, h); + Result := w; + end; - 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; +begin + Result := nil; + len := Length(text); + //e_LogWritefln('GetLines @%s len=%s [%s]', [MaxWidth, len, text]); - SetLength(Result, Length(Result)+1); - Result[High(Result)] := str; - end; + while PrepareStep() do + begin + // Get longest possible sequence (this is not constant because fonts are not monospaced). + lastsep := 0; + repeat + if text[i] in [' ', '.', ',', ':', ';'] + then lastsep := i; + i += 1; + until (i > len) or (LineWidth() > MaxWidth); + + // Do not include part of a word if possible. + if (lastsep-k > 3) and (i <= len) and (text[i] <> ' ') + then i := lastsep + 1; + + // Add line. + SetLength(Result, lines + 1); + Result[lines] := GetLine(i-1, True); + //e_LogWritefln(' -> (%s:%s::%s) [%s]', [k, i, LineWidth(), Result[lines]]); + lines += 1; + + k := i; end; end; -procedure Sort(var a: SArray); +procedure Sort(var a: SSArray); var i, j: Integer; s: string; @@ -929,7 +995,7 @@ begin end; end; -function InSArray(a: string; arr: SArray): Boolean; +function InSArray(a: string; arr: SSArray): Boolean; var b: Integer; begin @@ -978,7 +1044,7 @@ begin Result := True; end; -function parse(s: String): SArray; +function parse(s: String): SSArray; var a: Integer; begin @@ -1004,7 +1070,7 @@ begin end; end; -function parse2(s: string; delim: Char): SArray; +function parse2(s: string; delim: Char): SSArray; var a: Integer; begin @@ -1059,7 +1125,7 @@ begin CloseFile(F); end; -procedure SortSArray(var S: SArray); +procedure SortSArray(var S: SSArray); var b: Boolean; i: Integer; @@ -1168,4 +1234,19 @@ begin 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.