Change GetInputDeviceState to return InputDeviceState_NoInputHandler instead of InputDeviceState_Invalid

Rename "_Disconnected" to "_Unplugged"
This commit is contained in:
Chris Danford
2007-09-09 04:11:39 +00:00
parent bd7e452c33
commit 7ae238376d
3 changed files with 8 additions and 6 deletions
+1 -1
View File
@@ -151,7 +151,7 @@ InputDeviceState RageInput::GetInputDeviceState( InputDevice id )
}
}
return InputDeviceState_Invalid;
return InputDeviceState_NoInputHandler;
}
RString RageInput::GetDisplayDevicesString() const
+3 -2
View File
@@ -10,8 +10,9 @@
static const char *InputDeviceStateNames[] = {
"Connected",
"Disconnected",
"MissingMultitap",
"Unplugged",
"NeedsMultitap",
"NoInputHandler",
};
XToString( InputDeviceState );
+4 -3
View File
@@ -77,9 +77,10 @@ struct InputDeviceInfo
enum InputDeviceState
{
InputDeviceState_Connected,
InputDeviceState_Disconnected,
InputDeviceState_MissingMultitap,
InputDeviceState_Connected, // has an InputHandler and controller is plugged in
InputDeviceState_Unplugged, // has an InputHandler but controller is unplugged or lost wireless link
InputDeviceState_NeedsMultitap, // has an InputHandler but needs a multitap to function
InputDeviceState_NoInputHandler, // there is no InputHandler that implements this InputDevice
NUM_InputDeviceState,
InputDeviceState_Invalid
};