"holmes pause" mode

diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index daec002afce309a4120acfbfcb4c574e38689d30..b0f64563e8cfd2ecb1a3ad1ef39aaebde48a7469 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
@@ -104,6 +104,7 @@ function  g_Game_GetFirstMap(WAD: String): String;
 function  g_Game_GetNextMap(): String;
 procedure g_Game_NextLevel();
 procedure g_Game_Pause(Enable: Boolean);
+procedure g_Game_HolmesPause(Enable: Boolean);
 procedure g_Game_InGameMenu(Show: Boolean);
 function  g_Game_IsWatchedPlayer(UID: Word): Boolean;
 function  g_Game_IsWatchedTeam(Team: Byte): Boolean;
@@ -231,7 +232,8 @@ var
   gServInterTime: Byte = 0;
   gGameStartTime: LongWord = 0;
   gTotalMonsters: Integer = 0;
-  gPause: Boolean;
+  gPauseMain: Boolean = false;
+  gPauseHolmes: Boolean = false;
   gShowTime: Boolean = True;
   gShowFPS: Boolean = False;
   gShowGoals: Boolean = True;
@@ -331,7 +333,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;
+function conIsCheatsEnabled (): Boolean; inline;
+function gPause (): Boolean; inline;
 
 
 implementation
@@ -347,11 +350,20 @@ uses
 
 
 // ////////////////////////////////////////////////////////////////////////// //
-function conIsCheatsEnabled (): Boolean;
+function gPause (): Boolean; inline; begin result := gPauseMain or gPauseHolmes; end;
+
+
+// ////////////////////////////////////////////////////////////////////////// //
+function conIsCheatsEnabled (): Boolean; inline;
 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;
+  if g_Game_IsNet then exit;
+  if not gDebugMode then
+  begin
+    if not gCheats then exit;
+    if not (gGameSettings.GameType in [GT_SINGLE, GT_CUSTOM]) then exit;
+    if (gGameSettings.GameMode <> GM_COOP) then exit;
+  end;
   result := true;
 end;
 
@@ -852,8 +864,9 @@ begin
     MH_SEND_GameEvent(NET_EV_MAPEND, Byte(gMissionFailed));
 
 // Ñòîï èãðà:
-  gPause := False;
-  gGameOn := False;
+  gPauseMain := false;
+  gPauseHolmes := false;
+  gGameOn := false;
 
   g_Game_StopAllSounds(False);
 
@@ -1260,8 +1273,9 @@ begin
       until FindNext(SR) <> 0;
     FindClose(SR);
 
-    gGameOn := False;
-    gPause := False;
+    gGameOn := false;
+    gPauseMain := false;
+    gPauseHolmes := false;
     gTime := 0;
     LastScreenShot := 0;
 
@@ -3343,7 +3357,7 @@ begin
     end;
   end;
 
-  if gPause and gGameOn and (g_ActiveWindow = nil) then
+  if gPauseMain and gGameOn and (g_ActiveWindow = nil) then
   begin
     //e_DrawFillQuad(0, 0, gScreenWidth-1, gScreenHeight-1, 48, 48, 48, 180);
     e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
@@ -4253,7 +4267,8 @@ begin
     end;
 
   gExit := 0;
-  gPause := False;
+  gPauseMain := false;
+  gPauseHolmes := false;
   gTime := 0;
   NetTimeToUpdate := 1;
   NetTimeToReliable := 0;
@@ -5559,7 +5574,7 @@ begin
   else if cmd = 'pause' then
   begin
     if (g_ActiveWindow = nil) then
-      g_Game_Pause(not gPause);
+      g_Game_Pause(not gPauseMain);
   end
   else if cmd = 'endgame' then
     gExit := EXIT_SIMPLE
@@ -6557,19 +6572,31 @@ begin
     end;
 end;
 
-procedure g_Game_Pause(Enable: Boolean);
+procedure g_Game_Pause (Enable: Boolean);
+var
+  oldPause: Boolean;
 begin
-  if not gGameOn then
-    Exit;
+  if not gGameOn then exit;
 
-  if gPause = Enable then
-    Exit;
+  if not (gGameSettings.GameType in [GT_SINGLE, GT_CUSTOM]) then exit;
 
-  if not (gGameSettings.GameType in [GT_SINGLE, GT_CUSTOM]) then
-    Exit;
+  oldPause := gPause;
+  gPauseMain := Enable;
+
+  if (gPause <> oldPause) then g_Game_PauseAllSounds(gPause);
+end;
+
+procedure g_Game_HolmesPause (Enable: Boolean);
+var
+  oldPause: Boolean;
+begin
+  if not gGameOn then exit;
+  if not (gGameSettings.GameType in [GT_SINGLE, GT_CUSTOM]) then exit;
+
+  oldPause := gPause;
+  gPauseHolmes := Enable;
 
-  gPause := Enable;
-  g_Game_PauseAllSounds(Enable);
+  if (gPause <> oldPause) then g_Game_PauseAllSounds(gPause);
 end;
 
 procedure g_Game_PauseAllSounds(Enable: Boolean);

diff --git a/src/game/g_holmes.pas b/src/game/g_holmes.pas
index e23d6c74722e265135164ee32d165f186f963d37..88edf86ca907be0d32fa0193a27b02e77fa02d65 100644 (file)
--- a/src/game/g_holmes.pas
+++ b/src/game/g_holmes.pas
@@ -1275,6 +1275,7 @@ function g_Holmes_MouseEvent (var ev: THMouseEvent): Boolean;
 var
   he: THMouseEvent;
 begin
+  if g_Game_IsNet then begin result := false; exit; end;
   holmesInitCommands();
   holmesInitBinds();
   result := true;
@@ -1304,6 +1305,7 @@ var
   end;
 
 begin
+  if g_Game_IsNet then begin result := false; exit; end;
   holmesInitCommands();
   holmesInitBinds();
   result := false;
@@ -1354,6 +1356,7 @@ end;
 // ////////////////////////////////////////////////////////////////////////// //
 procedure g_Holmes_Draw ();
 begin
+  if g_Game_IsNet then exit;
   {$IF not DEFINED(HEADLESS)}
   holmesInitCommands();
   holmesInitBinds();
@@ -1364,10 +1367,7 @@ begin
   glDisable(GL_SCISSOR_TEST);
   glDisable(GL_TEXTURE_2D);
 
-  if gGameOn then
-  begin
-    plrDebugDraw();
-  end;
+  if gGameOn then plrDebugDraw();
   {$ENDIF}
 
   laserSet := false;
@@ -1376,6 +1376,7 @@ end;
 
 procedure g_Holmes_DrawUI ();
 begin
+  if g_Game_IsNet then exit;
   {$IF not DEFINED(HEADLESS)}
   glPushMatrix();
   glScalef(g_holmes_ui_scale, g_holmes_ui_scale, 1.0);
@@ -1438,6 +1439,8 @@ end;
 
 procedure dbgToggleTraceBox (arg: Integer=-1); begin if (arg < 0) then showTraceBox := not showTraceBox else showTraceBox := (arg > 0); end;
 
+procedure dbgToggleHolmesPause (arg: Integer=-1); begin if (arg < 0) then g_Game_HolmesPause(not gPauseHolmes) else g_Game_HolmesPause(arg > 0); end;
+
 procedure cbAtcurSelectMonster ();
   function monsAtDump (mon: TMonster; tag: Integer): Boolean;
   begin
@@ -1558,6 +1561,8 @@ begin
   cmdAdd('atcur_disable_walls', cbAtcurToggleWalls, 'disable walls', 'wall control');
 
   cmdAdd('dbg_tracebox', dbgToggleTraceBox, 'test traceBox()', 'player control');
+
+  cmdAdd('hlm_pause', dbgToggleHolmesPause, '"Holmes" pause mode', 'game control');
 end;
 
 
@@ -1596,6 +1601,8 @@ begin
 
     keybindAdd('C-1', 'mon_spawn zombie');
 
+    keybindAdd('C-S-P', 'hlm_pause');
+
     // mouse
     msbindAdd('LMB', 'atcur_select_monster');
     msbindAdd('M-LMB', 'atcur_dump_monsters');