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/doom/d_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/doom')

diff --git a/src/doom/d_main.c b/src/doom/d_main.c
index eb36f4bb..931c50a8 100644
--- a/src/doom/d_main.c
+++ b/src/doom/d_main.c
@@ -409,7 +409,7 @@ boolean D_GrabMouseCallback(void)
 
     // only grab mouse when playing levels (but not demos)
 
-    return (gamestate == GS_LEVEL) && !demoplayback;
+    return (gamestate == GS_LEVEL) && !demoplayback && !advancedemo;
 }
 
 //
@@ -426,9 +426,9 @@ void D_DoomLoop (void)
 
     I_SetWindowTitle(gamedescription);
     I_GraphicsCheckCommandLine();
+    I_SetGrabMouseCallback(D_GrabMouseCallback);
     I_InitGraphics();
     I_EnableLoadingDisk();
-    I_SetGrabMouseCallback(D_GrabMouseCallback);
 
     V_RestoreBuffer();
     R_ExecuteSetViewSize();
-- 
cgit v1.2.3