summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2005-09-01 00:01:36 +0000
committerSimon Howard2005-09-01 00:01:36 +0000
commite58b687ef944851bed7a3cbaede0c9f59cc724b6 (patch)
tree1756d1a3b30ece17d8d5ddcb668c2f6616a17681
parent18db00e1c410b77426072720ad55d5117b457725 (diff)
downloadchocolate-doom-e58b687ef944851bed7a3cbaede0c9f59cc724b6.tar.gz
chocolate-doom-e58b687ef944851bed7a3cbaede0c9f59cc724b6.tar.bz2
chocolate-doom-e58b687ef944851bed7a3cbaede0c9f59cc724b6.zip
-nograbmouse option
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 64
-rw-r--r--src/i_video.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/i_video.c b/src/i_video.c
index 4bc4a5f1..8d226252 100644
--- a/src/i_video.c
+++ b/src/i_video.c
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: i_video.c 63 2005-08-31 23:58:28Z fraggle $
+// $Id: i_video.c 64 2005-09-01 00:01:36Z fraggle $
//
// Copyright(C) 1993-1996 Id Software, Inc.
// Copyright(C) 2005 Simon Howard
@@ -22,6 +22,9 @@
// 02111-1307, USA.
//
// $Log$
+// Revision 1.21 2005/09/01 00:01:36 fraggle
+// -nograbmouse option
+//
// Revision 1.20 2005/08/31 23:58:28 fraggle
// smarter mouse grabbing for windowed mode
//
@@ -94,7 +97,7 @@
//-----------------------------------------------------------------------------
static const char
-rcsid[] = "$Id: i_video.c 63 2005-08-31 23:58:28Z fraggle $";
+rcsid[] = "$Id: i_video.c 64 2005-09-01 00:01:36Z fraggle $";
#include <ctype.h>
#include <SDL.h>
@@ -736,6 +739,10 @@ void I_InitGraphics(void)
flags |= SDL_SWSURFACE | SDL_HWPALETTE | SDL_DOUBLEBUF;
+ // mouse grabbing, defaults to on
+
+ grabmouse = !M_CheckParm("-nograbmouse");
+
// default to fullscreen mode, allow override with command line
// nofullscreen because we love prboom