diff --git a/src/game/g_basic.pas b/src/game/g_basic.pas
index 7024514be8898ce6796ea8dd5b9213f69e8c6893..ccfd5d91fdb489b4d539b07818b05a43ea1657ba 100644 (file)
--- a/src/game/g_basic.pas
+++ b/src/game/g_basic.pas
function g_GetBuilderName (): AnsiString;
function g_GetBuildHash (full: Boolean = True): AnsiString;
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_CreateUID(UIDType: Byte): Word;
function g_GetUIDType(UID: Word): Byte;
function g_GetBuildHash (full: Boolean = True): AnsiString;
begin
function g_GetBuildHash (full: Boolean = True): AnsiString;
begin
- if {$I %D2DF_BUILD_USER%} <> '' then
+ if {$I %D2DF_BUILD_HASH%} <> '' then
if full then
result := {$I %D2DF_BUILD_HASH%}
else
if full then
result := {$I %D2DF_BUILD_HASH%}
else
end;
{$POP}
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);
function g_PatchLength(X1, Y1, X2, Y2: Integer): Word;
begin
Result := Min(Round(Hypot(Abs(X2-X1), Abs(Y2-Y1))), 65535);
end;
end;
end;
end;
-function GetLines (Text: string; FontID: DWORD; MaxWidth: Word): SSArray;
- var i, j, len, lines: Integer;
+function GetLines (text: string; FontID: DWORD; MaxWidth: Word): SSArray;
+ var
+ k: Integer = 1;
+ lines: Integer = 0;
+ i, len, lastsep: Integer;
+
+ function PrepareStep (): Boolean; inline;
+ begin
+ // Skip leading spaces.
+ while PChar(text)[k-1] = ' ' do k += 1;
+ Result := k <= len;
+ i := k;
+ end;
- function GetLine (j, i: Integer): String;
+ function GetLine (j: Integer; Strip: Boolean): String; inline;
begin
begin
- result := Copy(text, j, i - j + 1);
+ // Exclude trailing spaces from the line.
+ if Strip then
+ while text[j] = ' ' do j -= 1;
+
+ Result := Copy(text, k, j-k+1);
end;
end;
- function GetWidth (j, i: Integer): Integer;
+ function LineWidth (): Integer; inline;
var w, h: Word;
begin
var w, h: Word;
begin
- e_CharFont_GetSize(FontID, GetLine(j, i), w, h);
- result := w
+ e_CharFont_GetSize(FontID, GetLine(i, False), w, h);
+ Result := w;
end;
begin
end;
begin
- 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
+ Result := nil;
+ len := Length(text);
+ //e_LogWritefln('GetLines @%s len=%s [%s]', [MaxWidth, len, text]);
+
+ while PrepareStep() do
begin
begin
- (* --- 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;
+ // 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;
end;
end;