From 8a667c801213131d7445045f4a4fe496f2aa306d Mon Sep 17 00:00:00 2001 From: tma Date: Fri, 14 Oct 2005 22:58:28 +0000 Subject: * Removed hard coded mouse acceleration in the unix build(s) * Added CVAR_ROM cl_platformSensitivity to normalise the scale of cl_sensitivity across platforms git-svn-id: svn://svn.icculus.org/quake3/trunk@160 edf5b092-35ff-0310-97b2-ce42778d08ea --- code/unix/linux_glimp.c | 22 ++++++---------------- code/unix/sdl_glimp.c | 6 ++---- 2 files changed, 8 insertions(+), 20 deletions(-) (limited to 'code/unix') diff --git a/code/unix/linux_glimp.c b/code/unix/linux_glimp.c index a5a9fe0..028a810 100644 --- a/code/unix/linux_glimp.c +++ b/code/unix/linux_glimp.c @@ -573,14 +573,8 @@ static void HandleEvents(void) { if (in_dgamouse->value) { - if (abs(event.xmotion.x_root) > 1) - mx += event.xmotion.x_root * 2; - else - mx += event.xmotion.x_root; - if (abs(event.xmotion.y_root) > 1) - my += event.xmotion.y_root * 2; - else - my += event.xmotion.y_root; + mx += event.xmotion.x_root; + my += event.xmotion.y_root; if (t - mouseResetTime > MOUSE_RESET_DELAY ) { Sys_QueEvent( t, SE_MOUSE, mx, my, 0, NULL ); @@ -604,14 +598,8 @@ static void HandleEvents(void) dx = ((int)event.xmotion.x - mwx); dy = ((int)event.xmotion.y - mwy); - if (abs(dx) > 1) - mx += dx * 2; - else - mx += dx; - if (abs(dy) > 1) - my += dy * 2; - else - my += dy; + mx += dx; + my += dy; mwx = event.xmotion.x; mwy = event.xmotion.y; @@ -1725,6 +1713,8 @@ void IN_Init(void) { in_joystickDebug = Cvar_Get ("in_debugjoystick", "0", CVAR_TEMP); joy_threshold = Cvar_Get ("joy_threshold", "0.15", CVAR_ARCHIVE); // FIXME: in_joythreshold + Cvar_Set( "cl_platformSensitivity", "2.0" ); + if (in_mouse->value) mouse_avail = qtrue; else diff --git a/code/unix/sdl_glimp.c b/code/unix/sdl_glimp.c index 2724811..81855f7 100644 --- a/code/unix/sdl_glimp.c +++ b/code/unix/sdl_glimp.c @@ -320,10 +320,6 @@ static void HandleEvents(void) case SDL_MOUSEMOTION: if (mouse_active) { - if (abs(e.motion.xrel) > 1) - e.motion.xrel *= 2; - if (abs(e.motion.yrel) > 1) - e.motion.yrel *= 2; Sys_QueEvent( t, SE_MOUSE, e.motion.xrel, e.motion.yrel, 0, NULL ); } break; @@ -1204,6 +1200,8 @@ void IN_Init(void) { in_joystickDebug = Cvar_Get ("in_debugjoystick", "0", CVAR_TEMP); joy_threshold = Cvar_Get ("joy_threshold", "0.15", CVAR_ARCHIVE); // FIXME: in_joythreshold + Cvar_Set( "cl_platformSensitivity", "2.0" ); + if (in_mouse->value) mouse_avail = qtrue; else -- cgit v1.2.3