X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_basic.pas;h=367c0e1e87d1850a43fdfeca03ec9bc2b1368927;hb=f65767273250d1d0023d2b8b1050b12931586f6f;hp=ccfd5d91fdb489b4d539b07818b05a43ea1657ba;hpb=331eb2883320ee665901d7a4bf9a76f5ff74e195;p=d2df-sdl.git

diff --git a/src/game/g_basic.pas b/src/game/g_basic.pas
index ccfd5d9..367c0e1 100644
--- a/src/game/g_basic.pas
+++ b/src/game/g_basic.pas
@@ -55,7 +55,6 @@ 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 g_Look(a, b: PObj; d: TDirection): Boolean;
 procedure IncMax(var A: Integer; B, Max: Integer); overload;
 procedure IncMax(var A: Single; B, Max: Single); overload;
 procedure IncMax(var A: Integer; Max: Integer); overload;
@@ -77,8 +76,6 @@ 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): 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;
@@ -101,8 +98,8 @@ var
 implementation
 
 uses
-  Math, geom, e_log, g_map, g_gfx, g_player, SysUtils, MAPDEF,
-  StrUtils, e_graphics, g_monsters, g_items, g_game;
+  Math, geom, e_log, g_map, g_player, SysUtils, MAPDEF,
+  StrUtils, g_monsters, g_items, g_game;
 
 {$PUSH}
 {$WARN 2054 OFF} // unknwon env var
@@ -567,23 +564,6 @@ begin
   Result := tab[a];
 end;
 
-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 = TDirection.D_LEFT)) or
-     ((b^.X < a^.X) and (d = TDirection.D_RIGHT)) then
-  begin
-    Result := False;
-    Exit;
-  end;
-
-  Result := g_TraceVector(a^.X+a^.Rect.X+(a^.Rect.Width div 2),
-                          a^.Y+a^.Rect.Y+(a^.Rect.Height div 2),
-                          b^.X+b^.Rect.X+(b^.Rect.Width div 2),
-                          b^.Y+b^.Rect.Y+(b^.Rect.Height div 2));
-end;
-
 function GetAngle(baseX, baseY, pointX, PointY: Integer): SmallInt;
 var
   c: Single;
@@ -743,82 +723,6 @@ begin
     end;
 end;
 
-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: Integer; Strip: Boolean): String; inline;
-  begin
-    // Exclude trailing spaces from the line.
-    if Strip then
-      while text[j] = ' ' do j -= 1; 
-
-    Result := Copy(text, k, j-k+1);
-  end;
-
-  function LineWidth (): Integer; inline;
-    var w, h: Word;
-  begin
-    e_CharFont_GetSize(FontID, GetLine(i, False), w, h);
-    Result := w;
-  end;
-
-begin
-  Result := nil;
-  len := Length(text);
-  //e_LogWritefln('GetLines @%s len=%s [%s]', [MaxWidth, len, text]);
-
-  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: SSArray);
-var
-  i, j: Integer;
-  s: string;
-begin
-  if a = nil then Exit;
-
-  for i := High(a) downto Low(a) do
-    for j := Low(a) to High(a)-1 do
-      if LowerCase(a[j]) > LowerCase(a[j+1]) then
-      begin
-        s := a[j];
-        a[j] := a[j+1];
-        a[j+1] := s;
-      end;
-end;
-
 function Sscanf(const s: String; const fmt: String;
                 const Pointers: array of Pointer): Integer;
 var