working on mouse stuff, one part at a time.

This commit is contained in:
AJ Kelly
2011-02-14 13:41:44 -06:00
parent 24a15bae96
commit c9c61c4bb9
2 changed files with 4 additions and 8 deletions
+3 -5
View File
@@ -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<DeviceInput> DeviceInputList;