more code for tracing and other shit; NOTHING IS WORKING YET

[d2df-sdl.git] / src / game / g_basic.pas

diff --git a/src/game/g_basic.pas b/src/game/g_basic.pas
index 8e1ae926769f02fa83676e5a685bd9274417d124..2300b1380fcb892f99c50ba8100f9295daabfc9d 100644 (file)
--- a/src/game/g_basic.pas
+++ b/src/game/g_basic.pas
@@ -88,11 +88,15 @@ procedure SortSArray(var S: SArray);
 function b_Text_Format(S: string): string;
 function b_Text_Unformat(S: string): string;
 
+
+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, 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
@@ -201,16 +205,10 @@ begin
   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 := not g_Map_traceToNearestWall(x1, y1, x2, y2, @wallHitX, @wallHitY);
+  if (g_profile_los) then g_Mons_LOS_End();
 end;
 
 
@@ -454,6 +452,8 @@ 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 = D_LEFT)) or
      ((b^.X < a^.X) and (d = D_RIGHT)) then
   begin