X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_game.pas;h=b198947e145dffab6b26a56ae1591635a59cfb39;hb=52cb3c5b37a706c085c14e89b33361ac349bbe74;hp=833baf5d45d6cd544cf5f3d86af065869779b715;hpb=27bcb8324b72ba67b2f6a43660fc5eecbb119750;p=d2df-sdl.git

diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index 833baf5..b198947 100644
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
@@ -124,7 +124,6 @@ procedure GameCVars(P: SArray);
 procedure GameCommands(P: SArray);
 procedure GameCheats(P: SArray);
 procedure DebugCommands(P: SArray);
-procedure ProfilerCommands(P: SArray);
 procedure g_Game_Process_Params;
 procedure g_Game_SetLoadingText(Text: String; Max: Integer; reWrite: Boolean);
 procedure g_Game_StepLoading();
@@ -321,6 +320,8 @@ 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);
 
+function conIsCheatsEnabled (): Boolean;
+
 
 implementation
 
@@ -334,6 +335,16 @@ uses
   utils, sfs, g_holmes;
 
 
+// ////////////////////////////////////////////////////////////////////////// //
+function conIsCheatsEnabled (): Boolean;
+begin
+  result := false;
+  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;
+  result := true;
+end;
+
+
 // ////////////////////////////////////////////////////////////////////////// //
 var
   profileFrameDraw: TProfiler = nil;
@@ -971,6 +982,17 @@ begin
     gExit := 0;
 end;
 
+procedure drawTime(X, Y: Integer); inline;
+begin
+  e_TextureFontPrint(x, y,
+                     Format('%d:%.2d:%.2d', [
+                       gTime div 1000 div 3600,
+                       (gTime div 1000 div 60) mod 60,
+                       gTime div 1000 mod 60
+                     ]),
+                     gStdFont);
+end;
+
 procedure DrawStat();
 var
   pc, x, y, w, h: Integer;
@@ -1000,6 +1022,8 @@ begin
   e_DrawFillQuad(x, y, x+w-1, y+h-1, 64, 64, 64, 32);
   e_DrawQuad(x, y, x+w-1, y+h-1, 255, 127, 0);
 
+  drawTime(x+w-78, y+8);
+
   wad := g_ExtractWadNameNoPath(gMapInfo.Map);
   map := g_ExtractFileName(gMapInfo.Map);
   mapstr := wad + ':\' + map + ' - ' + gMapInfo.Name;
@@ -2855,8 +2879,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
@@ -2907,6 +2942,11 @@ begin
   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
@@ -3255,7 +3295,7 @@ begin
   end;
 
   // draw inspector
-  g_Holmes_Draw();
+  if (g_holmes_enabled) then g_Holmes_Draw();
 
   g_Console_Draw();
 
@@ -3273,9 +3313,7 @@ begin
   end;
 
   if gGameOn and gShowTime and (gGameSettings.GameType in [GT_CUSTOM, GT_SERVER, GT_CLIENT]) then
-  e_TextureFontPrint(gScreenWidth-72, 0,
-                     Format('%d:%.2d:%.2d', [gTime div 1000 div 3600, (gTime div 1000 div 60) mod 60, gTime div 1000 mod 60]),
-                     gStdFont);
+    drawTime(gScreenWidth-72, gScreenHeight-16);
 
   if gGameOn then drawProfilers();
 end;
@@ -4947,53 +4985,6 @@ begin
   end;
 end;
 
-// profiler console commands
-procedure ProfilerCommands (P: SArray);
-var
-  cmd: string;
-
-  function getBool (idx: Integer): Integer;
-  begin
-    if (idx < 0) or (idx > High(P)) then begin result := -1; exit; end;
-    result := 0;
-    if (P[idx] = '1') or (P[idx] = 'on') or (P[idx] = 'true') or (P[idx] = 'tan') then result := 1;
-  end;
-
-  procedure binaryFlag (var flag: Boolean; msg: string);
-  begin
-    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;
-  end;
-
-begin
-  //if not gDebugMode then exit;
-  cmd := LowerCase(P[0]);
-
-  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 = 'mon_think') then begin binaryFlag(gmon_debug_think, 'monster thinking'); exit; end;
-end;
-
 
 procedure DebugCommands(P: SArray);
 var
@@ -6975,4 +6966,22 @@ begin
   SetLength(pars, 0);
 end;
 
+begin
+  conRegVar('pf_draw_frame', @g_profile_frame_draw, 'draw frame rendering profiles', 'render profiles');
+  //conRegVar('pf_update_frame', @g_profile_frame_update, 'draw frame updating profiles', 'update profiles');
+  conRegVar('pf_coldet', @g_profile_collision, 'draw collision detection profiles', 'coldet profiles');
+  conRegVar('pf_los', @g_profile_los, 'draw monster LOS profiles', 'monster LOS profiles');
+
+  conRegVar('r_sq_draw', @gdbg_map_use_accel_render, 'accelerated spatial queries in rendering', 'accelerated rendering');
+  conRegVar('cd_sq_enabled', @gdbg_map_use_accel_coldet, 'accelerated spatial queries in map coldet', 'accelerated map coldet');
+  conRegVar('mon_sq_enabled', @gmon_debug_use_sqaccel, 'accelerated spatial queries for monsters', 'accelerated monster coldet');
+  conRegVar('wtrace_sq_enabled', @gwep_debug_fast_trace, 'accelerated spatial queries for weapon hitscan trace', 'accelerated weapon hitscan');
+
+  conRegVar('pr_enabled', @gpart_dbg_enabled, 'enable/disable particles', 'particles');
+  conRegVar('pr_phys_enabled', @gpart_dbg_phys_enabled, 'enable/disable particle physics', 'particle physics');
+
+  conRegVar('los_enabled', @gmon_dbg_los_enabled, 'enable/disable monster LOS calculations', 'monster LOS', true);
+  conRegVar('mon_think', @gmon_debug_think, 'enable/disable monster thinking', 'monster thinking', true);
+
+  conRegVar('dbg_holmes', @g_holmes_enabled, 'enable/disable Holmes', 'Holmes', true);
 end.