diff --git a/src/RageInputDevice.cpp b/src/RageInputDevice.cpp index 457840428a..7109c2c8c3 100644 --- a/src/RageInputDevice.cpp +++ b/src/RageInputDevice.cpp @@ -127,7 +127,6 @@ static void InitNames() g_mapNamesToString[JOY_AUX_3] = "Aux3"; g_mapNamesToString[JOY_AUX_4] = "Aux4"; - /* g_mapNamesToString[MOUSE_LEFT] = "left mouse button"; g_mapNamesToString[MOUSE_RIGHT] = "right mouse button"; g_mapNamesToString[MOUSE_MIDDLE] = "middle mouse button"; @@ -135,7 +134,6 @@ static void InitNames() g_mapNamesToString[MOUSE_BACK] = "back mouse button"; g_mapNamesToString[MOUSE_WHEELUP] = "mousewheel up"; g_mapNamesToString[MOUSE_WHEELDOWN] = "mousewheel down"; - */ FOREACHM( DeviceButton, RString, g_mapNamesToString, m ) g_mapStringToNames[m->second] = m->first; @@ -229,7 +227,7 @@ static const char *InputDeviceNames[] = { "Pump1", "Pump2", "Midi", - //"Mouse", + "Mouse", }; XToString( InputDevice ); StringToX( InputDevice ); diff --git a/src/RageInputDevice.h b/src/RageInputDevice.h index 58e89c2b01..3ced992701 100644 --- a/src/RageInputDevice.h +++ b/src/RageInputDevice.h @@ -46,7 +46,7 @@ enum InputDevice DEVICE_PUMP1, DEVICE_PUMP2, DEVICE_MIDI, - //DEVICE_MOUSE, + DEVICE_MOUSE, NUM_InputDevice, // leave this at the end InputDevice_Invalid // means this is NULL }; @@ -55,7 +55,7 @@ const RString& InputDeviceToString( InputDevice i ); InputDevice StringToInputDevice( const RString& s ); inline bool IsJoystick( InputDevice id ) { return DEVICE_JOY1 <= id && id < DEVICE_JOY1+NUM_JOYSTICKS; } inline bool IsPump( InputDevice id ) { return DEVICE_PUMP1 <= id && id < DEVICE_PUMP1+NUM_PUMPS; } -//inline bool IsMouse( InputDevice id ) { return id == DEVICE_MOUSE; } +inline bool IsMouse( InputDevice id ) { return id == DEVICE_MOUSE; } struct InputDeviceInfo { @@ -290,7 +290,6 @@ enum DeviceButton MIDI_LAST = 699, // Mouse: - /* MOUSE_LEFT = 700, MOUSE_RIGHT, MOUSE_MIDDLE, @@ -298,7 +297,6 @@ enum DeviceButton MOUSE_WHEELUP, MOUSE_WHEELDOWN, // for mice with forward and backwards buttons MOUSE_FORWARD, MOUSE_BACK, - */ NUM_DeviceButton, DeviceButton_Invalid @@ -354,7 +352,7 @@ public: void MakeInvalid() { device = InputDevice_Invalid; }; bool IsJoystick() const { return ::IsJoystick(device); } - //bool IsMouse() const { return ::IsMouse(device); } + bool IsMouse() const { return ::IsMouse(device); } }; typedef vector DeviceInputList;