diff options
Diffstat (limited to 'src/doom')
| -rw-r--r-- | src/doom/d_main.c | 30 | ||||
| -rw-r--r-- | src/doom/doomstat.h | 3 | ||||
| -rw-r--r-- | src/doom/g_game.c | 8 |
3 files changed, 25 insertions, 16 deletions
diff --git a/src/doom/d_main.c b/src/doom/d_main.c index 6a6ab57d..a7fed952 100644 --- a/src/doom/d_main.c +++ b/src/doom/d_main.c @@ -107,11 +107,6 @@ boolean fastparm; // checkparm of -fast boolean singletics = false; // debug flag to cancel adaptiveness -// If true, game is running as a screensaver - -boolean screensaver_mode = false; - - //extern int soundVolume; //extern int sfxVolume; //extern int musicVolume; @@ -340,7 +335,28 @@ void D_Display (void) } while (!done); } +// +// D_GrabMouseCallback +// +// Called to determine whether to grab the mouse pointer +// +boolean D_GrabMouseCallback(void) +{ + // Drone players don't need mouse focus + + if (drone) + return false; + + // when menu is active or game is paused, release the mouse + + if (menuactive || paused) + return false; + + // only grab mouse when playing levels (but not demos) + + return (gamestate == GS_LEVEL) && !demoplayback; +} // // D_DoomLoop @@ -363,6 +379,8 @@ void D_DoomLoop (void) TryRunTics(); I_InitGraphics (); + I_SetGrabMouseCallback(D_GrabMouseCallback); + I_SetWindowTitle(gamedescription); R_ExecuteSetViewSize(); @@ -868,6 +886,8 @@ void D_DoomMain (void) devparm = M_CheckParm ("-devparm"); + I_DisplayFPSDots(devparm); + //! // @category net // @vanilla diff --git a/src/doom/doomstat.h b/src/doom/doomstat.h index 4fc174cd..2207fb25 100644 --- a/src/doom/doomstat.h +++ b/src/doom/doomstat.h @@ -55,8 +55,6 @@ extern boolean fastparm; // checkparm of -fast extern boolean devparm; // DEBUG: launched with -devparm -extern boolean screensaver_mode; // game running as a screensaver? - // ----------------------------------------------------- // Game Mode - identify IWAD as shareware, retail etc. // @@ -147,7 +145,6 @@ extern boolean paused; // Game Pause? extern boolean viewactive; extern boolean nodrawers; -extern boolean noblit; extern int viewwindowx; extern int viewwindowy; diff --git a/src/doom/g_game.c b/src/doom/g_game.c index 978f38ee..defcf368 100644 --- a/src/doom/g_game.c +++ b/src/doom/g_game.c @@ -122,7 +122,6 @@ boolean usergame; // ok to save / end game boolean timingdemo; // if true, exit with report on completion boolean nodrawers; // for comparative timing purposes -boolean noblit; // for comparative timing purposes int starttime; // for comparative timing purposes boolean viewactive; @@ -2056,13 +2055,6 @@ void G_TimeDemo (char* name) nodrawers = M_CheckParm ("-nodraw"); - //! - // @vanilla - // - // Disable blitting the screen. - // - - noblit = M_CheckParm ("-noblit"); timingdemo = true; singletics = true; |