diff options
| author | Simon Howard | 2013-10-12 03:22:10 +0000 |
|---|---|---|
| committer | Simon Howard | 2013-10-12 03:22:10 +0000 |
| commit | 6cf2d4cc8cfec2037ac55535ef69fe5b7bb39cb8 (patch) | |
| tree | 3bb0d8bbd54e2ae3b6d0a3e2d2118e270eb9ce85 /src/hexen/h2_main.c | |
| parent | 6e09cdf285c5f7526138c905130d17c7248eef63 (diff) | |
| download | chocolate-doom-6cf2d4cc8cfec2037ac55535ef69fe5b7bb39cb8.tar.gz chocolate-doom-6cf2d4cc8cfec2037ac55535ef69fe5b7bb39cb8.tar.bz2 chocolate-doom-6cf2d4cc8cfec2037ac55535ef69fe5b7bb39cb8.zip | |
Tweak mouse grab behavior: don't arbitrarily warp the mouse at game
startup.
Subversion-branch: /branches/v2-branch
Subversion-revision: 2699
Diffstat (limited to 'src/hexen/h2_main.c')
| -rw-r--r-- | src/hexen/h2_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/hexen/h2_main.c b/src/hexen/h2_main.c index 33d345e8..f1a22cd7 100644 --- a/src/hexen/h2_main.c +++ b/src/hexen/h2_main.c @@ -202,14 +202,14 @@ static void D_SetDefaultSavePath(void) static boolean D_GrabMouseCallback(void) { - // when menu is active or game is paused, release the mouse - + // 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; + return (gamestate == GS_LEVEL) && !advancedemo && !demoplayback; } // Message displayed when quitting Hexen @@ -620,8 +620,8 @@ void H2_GameLoop(void) } I_SetWindowTitle("Hexen"); I_GraphicsCheckCommandLine(); - I_InitGraphics(); I_SetGrabMouseCallback(D_GrabMouseCallback); + I_InitGraphics(); while (1) { |