From 6cf2d4cc8cfec2037ac55535ef69fe5b7bb39cb8 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sat, 12 Oct 2013 03:22:10 +0000
Subject: Tweak mouse grab behavior: don't arbitrarily warp the mouse at game
 startup.

Subversion-branch: /branches/v2-branch
Subversion-revision: 2699
---
 src/hexen/h2_main.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/hexen')

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)
     {
-- 
cgit v1.2.3