|
|
@ -18,7 +18,7 @@ |
|
|
|
#include "camera.h" |
|
|
|
#include "camera.h" |
|
|
|
#include "in_defs.h" |
|
|
|
#include "in_defs.h" |
|
|
|
#include "../engine/keydefs.h" |
|
|
|
#include "../engine/keydefs.h" |
|
|
|
#include "view.h" |
|
|
|
//#include "view.h"
|
|
|
|
#include "windows.h" |
|
|
|
#include "windows.h" |
|
|
|
|
|
|
|
|
|
|
|
#define MOUSE_BUTTON_COUNT 5 |
|
|
|
#define MOUSE_BUTTON_COUNT 5 |
|
|
@ -304,11 +304,6 @@ void IN_MouseMove ( float frametime, usercmd_t *cmd) |
|
|
|
|
|
|
|
|
|
|
|
gEngfuncs.GetViewAngles( (float *)viewangles ); |
|
|
|
gEngfuncs.GetViewAngles( (float *)viewangles ); |
|
|
|
|
|
|
|
|
|
|
|
if ( in_mlook.state & 1) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
V_StopPitchDrift (); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//jjb - this disbles normal mouse control if the user is trying to
|
|
|
|
//jjb - this disbles normal mouse control if the user is trying to
|
|
|
|
// move the camera, or if the mouse cursor is visible or if we're in intermission
|
|
|
|
// move the camera, or if the mouse cursor is visible or if we're in intermission
|
|
|
|
if ( !iMouseInUse && !g_iVisibleMouse && !gHUD.m_iIntermission ) |
|
|
|
if ( !iMouseInUse && !g_iVisibleMouse && !gHUD.m_iIntermission ) |
|
|
@ -791,18 +786,6 @@ void IN_JoyMove ( float frametime, usercmd_t *cmd ) |
|
|
|
{ |
|
|
|
{ |
|
|
|
viewangles[PITCH] += (fAxisValue * joy_pitchsensitivity->value) * aspeed * cl_pitchspeed->value; |
|
|
|
viewangles[PITCH] += (fAxisValue * joy_pitchsensitivity->value) * aspeed * cl_pitchspeed->value; |
|
|
|
} |
|
|
|
} |
|
|
|
V_StopPitchDrift(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
// no pitch movement
|
|
|
|
|
|
|
|
// disable pitch return-to-center unless requested by user
|
|
|
|
|
|
|
|
// *** this code can be removed when the lookspring bug is fixed
|
|
|
|
|
|
|
|
// *** the bug always has the lookspring feature on
|
|
|
|
|
|
|
|
if(lookspring->value == 0.0) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
V_StopPitchDrift(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
else |
|
|
|
else |
|
|
@ -844,7 +827,6 @@ void IN_JoyMove ( float frametime, usercmd_t *cmd ) |
|
|
|
{ |
|
|
|
{ |
|
|
|
viewangles[YAW] += (fAxisValue * joy_yawsensitivity->value) * speed * 180.0; |
|
|
|
viewangles[YAW] += (fAxisValue * joy_yawsensitivity->value) * speed * 180.0; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
break; |
|
|
|
break; |
|
|
@ -863,18 +845,6 @@ void IN_JoyMove ( float frametime, usercmd_t *cmd ) |
|
|
|
{ |
|
|
|
{ |
|
|
|
viewangles[PITCH] += (fAxisValue * joy_pitchsensitivity->value) * speed * 180.0; |
|
|
|
viewangles[PITCH] += (fAxisValue * joy_pitchsensitivity->value) * speed * 180.0; |
|
|
|
} |
|
|
|
} |
|
|
|
V_StopPitchDrift(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
// no pitch movement
|
|
|
|
|
|
|
|
// disable pitch return-to-center unless requested by user
|
|
|
|
|
|
|
|
// *** this code can be removed when the lookspring bug is fixed
|
|
|
|
|
|
|
|
// *** the bug always has the lookspring feature on
|
|
|
|
|
|
|
|
if( lookspring->value == 0.0 ) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
V_StopPitchDrift(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
break; |
|
|
|
break; |
|
|
@ -944,4 +914,4 @@ void IN_Init (void) |
|
|
|
|
|
|
|
|
|
|
|
IN_StartupMouse (); |
|
|
|
IN_StartupMouse (); |
|
|
|
IN_StartupJoystick (); |
|
|
|
IN_StartupJoystick (); |
|
|
|
} |
|
|
|
} |
|
|
|