mirror of
https://git.code.sf.net/p/quake/quakeforge-old
synced 2024-11-22 03:41:27 +00:00
Define uiWheelMessage and mouseactive here.
Removed unused variables. Some minor cleanups.
This commit is contained in:
parent
fce145168c
commit
bb1f7ac924
1 changed files with 11 additions and 14 deletions
|
@ -37,20 +37,21 @@ HRESULT (WINAPI *pDirectInputCreate)(HINSTANCE hinst, DWORD dwVersion,
|
||||||
// mouse variables
|
// mouse variables
|
||||||
cvar_t m_filter = {"m_filter","0"};
|
cvar_t m_filter = {"m_filter","0"};
|
||||||
|
|
||||||
int mouse_buttons;
|
int mouse_buttons;
|
||||||
int mouse_oldbuttonstate;
|
int mouse_oldbuttonstate;
|
||||||
POINT current_pos;
|
POINT current_pos;
|
||||||
int mouse_x, mouse_y, old_mouse_x, old_mouse_y, mx_accum, my_accum;
|
int mouse_x, mouse_y, old_mouse_x, old_mouse_y, mx_accum, my_accum;
|
||||||
|
unsigned int uiWheelMessage;
|
||||||
|
|
||||||
static qboolean restore_spi;
|
static qboolean restore_spi;
|
||||||
static int originalmouseparms[3], newmouseparms[3] = {0, 0, 1};
|
static int originalmouseparms[3], newmouseparms[3] = {0, 0, 1};
|
||||||
|
|
||||||
qboolean mouseinitialized;
|
qboolean mouseactive;
|
||||||
|
qboolean mouseinitialized;
|
||||||
static qboolean mouseparmsvalid, mouseactivatetoggle;
|
static qboolean mouseparmsvalid, mouseactivatetoggle;
|
||||||
static qboolean mouseshowtoggle = 1;
|
static qboolean mouseshowtoggle = 1;
|
||||||
static qboolean dinput_acquired;
|
static qboolean dinput_acquired;
|
||||||
static unsigned int mstate_di;
|
static unsigned int mstate_di;
|
||||||
unsigned int uiWheelMessage;
|
|
||||||
|
|
||||||
// joystick defines and variables
|
// joystick defines and variables
|
||||||
// where should defines be moved?
|
// where should defines be moved?
|
||||||
|
@ -423,8 +424,6 @@ IN_StartupMouse
|
||||||
*/
|
*/
|
||||||
void IN_StartupMouse (void)
|
void IN_StartupMouse (void)
|
||||||
{
|
{
|
||||||
HDC hdc;
|
|
||||||
|
|
||||||
if ( COM_CheckParm ("-nomouse") )
|
if ( COM_CheckParm ("-nomouse") )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -582,7 +581,6 @@ IN_MouseMove
|
||||||
void IN_MouseMove (usercmd_t *cmd)
|
void IN_MouseMove (usercmd_t *cmd)
|
||||||
{
|
{
|
||||||
int mx, my;
|
int mx, my;
|
||||||
HDC hdc;
|
|
||||||
int i;
|
int i;
|
||||||
DIDEVICEOBJECTDATA od;
|
DIDEVICEOBJECTDATA od;
|
||||||
DWORD dwElements;
|
DWORD dwElements;
|
||||||
|
@ -751,9 +749,6 @@ IN_Accumulate
|
||||||
*/
|
*/
|
||||||
void IN_Accumulate (void)
|
void IN_Accumulate (void)
|
||||||
{
|
{
|
||||||
int mx, my;
|
|
||||||
HDC hdc;
|
|
||||||
|
|
||||||
if (mouseactive)
|
if (mouseactive)
|
||||||
{
|
{
|
||||||
GetCursorPos (¤t_pos);
|
GetCursorPos (¤t_pos);
|
||||||
|
@ -791,9 +786,9 @@ IN_StartupJoystick
|
||||||
*/
|
*/
|
||||||
void IN_StartupJoystick (void)
|
void IN_StartupJoystick (void)
|
||||||
{
|
{
|
||||||
int i, numdevs;
|
int numdevs;
|
||||||
JOYCAPS jc;
|
JOYCAPS jc;
|
||||||
MMRESULT mmr;
|
MMRESULT mmr = !JOYERR_NOERROR;
|
||||||
|
|
||||||
// assume no joystick
|
// assume no joystick
|
||||||
joy_avail = false;
|
joy_avail = false;
|
||||||
|
@ -875,6 +870,8 @@ PDWORD RawValuePointer (int axis)
|
||||||
case JOY_AXIS_V:
|
case JOY_AXIS_V:
|
||||||
return &ji.dwVpos;
|
return &ji.dwVpos;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue