working on mouse stuff, one part at a time.
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user