summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2007-12-14 22:23:13 +0000
committerSimon Howard2007-12-14 22:23:13 +0000
commit030b38de23f85b129e357ed97e2a58e21391fe92 (patch)
tree8aab53488aa2253c6f8afe2038414d53fcd8bfe9
parent94bca7e14e0a245d6fcb06335dc244bb6181a519 (diff)
downloadchocolate-doom-030b38de23f85b129e357ed97e2a58e21391fe92.tar.gz
chocolate-doom-030b38de23f85b129e357ed97e2a58e21391fe92.tar.bz2
chocolate-doom-030b38de23f85b129e357ed97e2a58e21391fe92.zip
Don't grab the mouse if the mouse is disabled by -nomouse or through
use_mouse in the configuration file (thanks MikeRS). Subversion-branch: /trunk/chocolate-doom Subversion-revision: 990
-rw-r--r--NEWS2
-rw-r--r--src/i_video.c5
2 files changed, 7 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index e4e2baf7..869e0f69 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@
Bugs fixed:
* Desync with STRAIN demos and dehacked Misc values not being
set properly (thanks Lemonzest)
+ * Don't grab the mouse if the mouse is disabled via -nomouse
+ or use_mouse in the configuration file (thanks MikeRS).
1.0.0 (2007-12-10):
diff --git a/src/i_video.c b/src/i_video.c
index fe5aca8d..93548498 100644
--- a/src/i_video.c
+++ b/src/i_video.c
@@ -171,6 +171,11 @@ static boolean MouseShouldBeGrabbed()
if (fullscreen != FULLSCREEN_OFF)
return true;
+ // Don't grab the mouse if mouse input is disabled
+
+ if (!usemouse || nomouse)
+ return false;
+
// Drone players don't need mouse focus
if (drone)