From fa8c4f238671f5adc61e4d1ceb38948167d6e896 Mon Sep 17 00:00:00 2001
From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 1 Dec 2004 06:07:14 +0000
Subject: [PATCH] defaulting to nodinput mode again due to problems with dinput
 mode

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4803 d7cf8633-e32d-0410-b094-e92efae38249
---
 darkplaces.txt | 13 +++++++++----
 vid_wgl.c      | 10 +++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/darkplaces.txt b/darkplaces.txt
index 24140f61..ba8813d0 100644
--- a/darkplaces.txt
+++ b/darkplaces.txt
@@ -12,6 +12,11 @@ I am not very good at writing documentation, so this readme is organized as a
 feature list, with information on each feature, I hope it is still adequate
 documentation.
 
+Input Tips:
+If mouse movement is jerky but framerate is high, try typing "gl_finish 1"
+(without quotes) into the console (makes cpu wait for gpu before ending frame,
+which gives lousy input drivers a chance to catch up).
+
 Graphics Tips:
 Visit the Color Control submenu of Options, it's near the top, fiddle with
 gamma (or grey level if using the color levels mode) until the grey box
@@ -264,10 +269,10 @@ Video: -width <pixels> performs +vid_width <pixels> and also +vid_height <pixels
 Video: -window performs +vid_fullscreen 0
 Windows DirectSound: -primarysound locks the sound hardware for exclusive use
 Windows DirectSound: -snoforceformat uses the format that DirectSound returns, rather than forcing it
-Windows GDI Input: -noforcemaccel disables setting of mouse acceleration (-nodinput only, windows only)
-Windows GDI Input: -noforcemparms disables setting of mouse parameters (-nodinput only, windows only)
-Windows GDI Input: -noforcemspd disables setting of mouse speed (-nodinput only, windows only)
-Windows Input: -nodinput disables DirectInput for mouse/joystick input, gl_finish 1 mode recommended if this option is used as otherwise it tends to stutter due to input backlog.
+Windows GDI Input: -noforcemaccel disables setting of mouse acceleration (not used with -dinput, windows only)
+Windows GDI Input: -noforcemparms disables setting of mouse parameters (not used with -dinput, windows only)
+Windows GDI Input: -noforcemspd disables setting of mouse speed (not used with -dinput, windows only)
+Windows Input: -dinput enables DirectInput for mouse/joystick input
 Windows Input: -nojoy disables joystick support, may be a small speed increase
 Windows Sound: -sndspeed <hz> chooses 44100 hz, 22100 hz, or 11025 hz sound output rate
 Windows Sound: -wavonly uses wave sound instead of DirectSound
diff --git a/vid_wgl.c b/vid_wgl.c
index c6e0ff74..d5cd194e 100644
--- a/vid_wgl.c
+++ b/vid_wgl.c
@@ -1256,8 +1256,8 @@ void IN_StartupMouse (void)
 
 	mouseinitialized = true;
 
-// COMMANDLINEOPTION: Windows Input: -nodinput disables DirectInput for mouse/joystick input, gl_finish 1 mode recommended if this option is used as otherwise it tends to stutter due to input backlog.
-	if (!COM_CheckParm ("-nodinput"))
+// COMMANDLINEOPTION: Windows Input: -dinput enables DirectInput for mouse/joystick input
+	if (COM_CheckParm ("-dinput"))
 	{
 		dinput = IN_InitDInput ();
 
@@ -1277,18 +1277,18 @@ void IN_StartupMouse (void)
 
 		if (mouseparmsvalid)
 		{
-// COMMANDLINEOPTION: Windows GDI Input: -noforcemspd disables setting of mouse speed (-nodinput only, windows only)
+// COMMANDLINEOPTION: Windows GDI Input: -noforcemspd disables setting of mouse speed (not used with -dinput, windows only)
 			if ( COM_CheckParm ("-noforcemspd") )
 				newmouseparms[2] = originalmouseparms[2];
 
-// COMMANDLINEOPTION: Windows GDI Input: -noforcemaccel disables setting of mouse acceleration (-nodinput only, windows only)
+// COMMANDLINEOPTION: Windows GDI Input: -noforcemaccel disables setting of mouse acceleration (not used with -dinput, windows only)
 			if ( COM_CheckParm ("-noforcemaccel") )
 			{
 				newmouseparms[0] = originalmouseparms[0];
 				newmouseparms[1] = originalmouseparms[1];
 			}
 
-// COMMANDLINEOPTION: Windows GDI Input: -noforcemparms disables setting of mouse parameters (-nodinput only, windows only)
+// COMMANDLINEOPTION: Windows GDI Input: -noforcemparms disables setting of mouse parameters (not used with -dinput, windows only)
 			if ( COM_CheckParm ("-noforcemparms") )
 			{
 				newmouseparms[0] = originalmouseparms[0];
-- 
2.39.2