X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_game.pas;h=02a46f2c4ab9cb90ae13a484b6b08ca7a590770f;hb=cb39caa8b879b70aa096476a2e919d4a298f1fa5;hp=ab82f010edd0b0294f0338d3b6199400797f0efe;hpb=5b1aa7467400740cf8ee0fef8206580a3584eed4;p=d2df-sdl.git

diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index ab82f01..02a46f2 100644
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
@@ -313,12 +313,15 @@ var
   g_profile_frame_update: Boolean = false;
   g_profile_frame_draw: Boolean = false;
   g_profile_collision: Boolean = false;
+  g_profile_los: Boolean = false;
   g_profile_history_size: Integer = 1000;
 
+
 procedure g_ResetDynlights ();
 procedure g_AddDynLight (x, y, radius: Integer; r, g, b, a: Single);
 procedure g_DynLightExplosion (x, y, radius: Integer; r, g, b: Single);
 
+
 implementation
 
 uses
@@ -328,7 +331,7 @@ uses
   g_triggers, MAPDEF, g_monsters, e_sound, CONFIG,
   BinEditor, g_language, g_net, SDL,
   ENet, e_msg, g_netmsg, g_netmaster, GL, GLExt,
-  utils, sfs;
+  utils, sfs, g_holmes;
 
 
 // ////////////////////////////////////////////////////////////////////////// //
@@ -765,6 +768,11 @@ begin
   if gPlayer2 <> nil then gPlayer2.GodMode := False;
   if gPlayer1 <> nil then gPlayer1.NoTarget := False;
   if gPlayer2 <> nil then gPlayer2.NoTarget := False;
+
+  {$IF DEFINED(D2F_DEBUG)}
+  if gPlayer1 <> nil then gPlayer1.NoTarget := True;
+  gAimLine := true;
+  {$ENDIF}
 end;
 
 procedure g_Game_ExecuteEvent(Name: String);
@@ -2730,7 +2738,7 @@ type
       while (gDrawPanelList.count > 0) do
       begin
         pan := TPanel(gDrawPanelList.front());
-        e_WriteLog(Format('tagmask: 0x%04x; pan.tag: 0x%04x; pan.ArrIdx: %d', [tagmask, pan.tag, pan.ArrIdx]), MSG_NOTIFY);
+        e_WriteLog(Format('tagmask: 0x%04x; pan.tag: 0x%04x; pan.arrIdx: %d', [tagmask, pan.tag, pan.arrIdx]), MSG_NOTIFY);
         pan.Draw();
         gDrawPanelList.popFront();
       end;
@@ -2847,8 +2855,19 @@ begin
   if px > gMapInfo.Width-(gPlayerScreenSize.X div 2) then a := -gMapInfo.Width+gPlayerScreenSize.X;
   if py > gMapInfo.Height-(gPlayerScreenSize.Y div 2) then b := -gMapInfo.Height+gPlayerScreenSize.Y;
 
-  if gMapInfo.Width <= gPlayerScreenSize.X then a := 0;
-  if gMapInfo.Height <= gPlayerScreenSize.Y then b := 0;
+       if (gMapInfo.Width = gPlayerScreenSize.X) then a := 0
+  else if (gMapInfo.Width < gPlayerScreenSize.X) then
+  begin
+    // hcenter
+    a := (gPlayerScreenSize.X-gMapInfo.Width) div 2;
+  end;
+
+       if (gMapInfo.Height = gPlayerScreenSize.Y) then b := 0
+  else if (gMapInfo.Height < gPlayerScreenSize.Y) then
+  begin
+    // vcenter
+    b := (gPlayerScreenSize.Y-gMapInfo.Height) div 2;
+  end;
 
   if p.IncCam <> 0 then
   begin
@@ -2894,6 +2913,16 @@ begin
 
   //glTranslatef(a, b+p.IncCam, 0);
 
+  p.viewPortX := sX;
+  p.viewPortY := sY;
+  p.viewPortW := sWidth;
+  p.viewPortH := sHeight;
+
+  if (p = gPlayer1) then
+  begin
+    g_Holmes_plrView(p.viewPortX, p.viewPortY, p.viewPortW, p.viewPortH);
+  end;
+
   renderMapInternal(-c, -d, a, b+p.IncCam, true);
 
   if p.FSpectator then
@@ -2932,9 +2961,11 @@ end;
 procedure drawProfilers ();
 var
   px: Integer = -1;
+  py: Integer = -1;
 begin
-  if g_profile_frame_draw then px := px-drawProfiles(px, -1, profileFrameDraw);
-  if g_profile_collision then px := px-drawProfiles(px, -1, profMapCollision);
+  if g_profile_frame_draw then px := px-drawProfiles(px, py, profileFrameDraw);
+  if g_profile_collision then begin px := px-drawProfiles(px, py, profMapCollision); py -= calcProfilesHeight(profMonsLOS); end;
+  if g_profile_los then begin px := px-drawProfiles(px, py, profMonsLOS); py -= calcProfilesHeight(profMonsLOS); end;
 end;
 
 procedure g_Game_Draw();
@@ -3239,6 +3270,9 @@ begin
     g_ActiveWindow.Draw();
   end;
 
+  // draw inspector
+  if (g_holmes_enabled) then g_Holmes_Draw();
+
   g_Console_Draw();
 
   if g_debug_Sounds and gGameOn then
@@ -4941,102 +4975,47 @@ var
     if (P[idx] = '1') or (P[idx] = 'on') or (P[idx] = 'true') or (P[idx] = 'tan') then result := 1;
   end;
 
-begin
-  //if not gDebugMode then exit;
-  cmd := LowerCase(P[0]);
-
-  if cmd = 'pf_draw_frame' then
+  procedure binaryFlag (var flag: Boolean; msg: string);
   begin
-    g_profile_frame_draw := not g_profile_frame_draw;
-    exit;
-  end;
-
-  if cmd = 'pf_update_frame' then
-  begin
-    g_profile_frame_update := not g_profile_frame_update;
-    exit;
-  end;
-
-  if cmd = 'pf_coldet' then
-  begin
-    g_profile_collision := not g_profile_collision;
-    exit;
-  end;
-
-  if cmd = 'r_sq_draw' then
-  begin
-    case getBool(1) of
-      -1: begin end;
-       0: gdbg_map_use_accel_render := false;
-       1: gdbg_map_use_accel_render := true;
-    end;
-    if gdbg_map_use_accel_render then g_Console_Add('accelerated rendering: tan') else g_Console_Add('accelerated rendering: ona');
-    exit;
-  end;
-
-  if cmd = 'cd_sq_enabled' then
-  begin
-    case getBool(1) of
-      -1: begin end;
-       0: gdbg_map_use_accel_coldet := false;
-       1: gdbg_map_use_accel_coldet := true;
+    if (Length(p) > 2) then
+    begin
+      g_Console_Add('too many arguments to '''+P[0]+'''');
+    end
+    else
+    begin
+      case getBool(1) of
+        -1: begin end;
+         0: flag := false;
+         1: flag := true;
+      end;
+      if flag then g_Console_Add(msg+': tan') else g_Console_Add(msg+': ona');
     end;
-    if gdbg_map_use_accel_coldet then g_Console_Add('accelerated coldet: tan') else g_Console_Add('accelerated coldet: ona');
-    exit;
   end;
 
-  {
-  if (cmd = 'sq_use_grid') or (cmd = 'sq_use_tree') then
-  begin
-    gdbg_map_use_tree_coldet := (cmd = 'sq_use_tree');
-    if gdbg_map_use_tree_coldet then g_Console_Add('coldet acceleration: tree') else g_Console_Add('coldet acceleration: grid');
-    exit;
-  end;
+begin
+  //if not gDebugMode then exit;
+  cmd := LowerCase(P[0]);
 
-  if (cmd = 'r_sq_use_grid') or (cmd = 'r_sq_use_tree') then
-  begin
-    gdbg_map_use_tree_draw := (cmd = 'r_sq_use_tree');
-    if gdbg_map_use_tree_draw then g_Console_Add('render acceleration: tree') else g_Console_Add('render acceleration: grid');
-    exit;
-  end;
-  }
+  if (cmd = 'pf_draw_frame') then begin binaryFlag(g_profile_frame_draw, 'render profiles'); exit; end;
+  if (cmd = 'pf_update_frame') then begin binaryFlag(g_profile_frame_update, 'update profiles (not yet)'); exit; end;
+  if (cmd = 'pf_coldet') then begin binaryFlag(g_profile_collision, 'coldet profiles'); exit; end;
+  if (cmd = 'pf_los') then begin binaryFlag(g_profile_los, 'monster LOS profiles'); exit; end;
+  if (cmd = 'r_sq_draw') then begin binaryFlag(gdbg_map_use_accel_render, 'accelerated rendering'); exit; end;
+  if (cmd = 'cd_sq_enabled') then begin binaryFlag(gdbg_map_use_accel_coldet, 'accelerated map coldet'); exit; end;
+  if (cmd = 'mon_sq_enabled') then begin binaryFlag(gmon_debug_use_sqaccel, 'accelerated monster coldet'); exit; end;
+  if (cmd = 'wtrace_sq_enabled') then begin binaryFlag(gwep_debug_fast_trace, 'accelerated weapon hitscan'); exit; end;
+  if (cmd = 'pr_enabled') then begin binaryFlag(gpart_dbg_enabled, 'particles'); exit; end;
+  if (cmd = 'pr_phys_enabled') then begin binaryFlag(gpart_dbg_phys_enabled, 'particle physics'); exit; end;
+  if (cmd = 'los_enabled') then begin binaryFlag(gmon_dbg_los_enabled, 'LOS calculations'); exit; end;
 
-  {
-  if (cmd = 't_dump_node_queries') then
-  begin
-    case getBool(1) of
-      -1: begin end;
-       0: gdbg_map_dump_coldet_tree_queries := false;
-       1: gdbg_map_dump_coldet_tree_queries := true;
-    end;
-    if gdbg_map_dump_coldet_tree_queries then g_Console_Add('grid coldet tree queries: tan') else g_Console_Add('grid coldet tree queries: ona');
-    exit;
-  end;
-  }
-
-  if (cmd = 'mon_sq_enabled') then
-  begin
-    case getBool(1) of
-      -1: begin end;
-       0: gmon_debug_use_sqaccel := false;
-       1: gmon_debug_use_sqaccel := true;
-    end;
-    if gmon_debug_use_sqaccel then g_Console_Add('accelerated monster coldet: tan') else g_Console_Add('accelerated monster coldet: ona');
-    exit;
-  end;
+  if (not gGameOn) or (not gCheats) or ((gGameSettings.GameType <> GT_SINGLE) and
+     (gGameSettings.GameMode <> GM_COOP) and (not gDebugMode)) or g_Game_IsNet then exit;
 
-  if (cmd = 'wtrace_sq_enabled') then
-  begin
-    case getBool(1) of
-      -1: begin end;
-       0: gwep_debug_fast_trace := false;
-       1: gwep_debug_fast_trace := true;
-    end;
-    if gwep_debug_fast_trace then g_Console_Add('accelerated weapon hitscan: tan') else g_Console_Add('accelerated weapon hitscan: ona');
-    exit;
-  end;
+  if (cmd = 'mon_think') then begin binaryFlag(gmon_debug_think, 'monster thinking'); exit; end;
+  if (cmd = 'dbg_holmes') then begin binaryFlag(g_holmes_enabled, 'Holmes'); exit; end;
 end;
 
+
 procedure DebugCommands(P: SArray);
 var
   a, b: Integer;
@@ -6862,12 +6841,6 @@ var
 begin
   Parse_Params(pars);
 
-  s := Find_Param_Value(pars, '--profile-render');
-  if (s <> '') then g_profile_frame_draw := true;
-
-  s := Find_Param_Value(pars, '--profile-coldet');
-  if (s <> '') then g_profile_collision := true;
-
 // Debug mode:
   s := Find_Param_Value(pars, '--debug');
   if (s <> '') then