actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2006-06-15 06:30:35 +00:00
parent c9e55137a5
commit 0b1eedce2c
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/InputHandler/InputHandler.cpp
+3 -12
View File
@@ -120,13 +120,8 @@ RString InputHandler::GetDeviceSpecificInputString( const DeviceInput &di )
if( di.device == DEVICE_KEYBOARD ) if( di.device == DEVICE_KEYBOARD )
{ {
wchar_t c = DeviceButtonToChar( di.button, false ); wchar_t c = DeviceButtonToChar( di.button, false );
if( c ) if( c && c != L' ' ) // Don't show "Key " for space.
{
if( c == L' ' )
return SPACE.GetValue(); // Don't show "Key " for space.
else
return "Key " + Capitalize( WStringToRString(wstring()+c) ); return "Key " + Capitalize( WStringToRString(wstring()+c) );
}
return DeviceButtonToString( di.button ); return DeviceButtonToString( di.button );
} }
@@ -141,6 +136,7 @@ RString InputHandler::GetLocalizedInputString( const DeviceInput &di )
case KEY_END: return END.GetValue(); case KEY_END: return END.GetValue();
case KEY_UP: return UP.GetValue(); case KEY_UP: return UP.GetValue();
case KEY_DOWN: return DOWN.GetValue(); case KEY_DOWN: return DOWN.GetValue();
case KEY_SPACE: return SPACE.GetValue();
case KEY_LSHIFT: case KEY_RSHIFT: return SHIFT.GetValue(); case KEY_LSHIFT: case KEY_RSHIFT: return SHIFT.GetValue();
case KEY_LCTRL: case KEY_RCTRL: return CTRL.GetValue(); case KEY_LCTRL: case KEY_RCTRL: return CTRL.GetValue();
case KEY_LALT: case KEY_RALT: return ALT.GetValue(); case KEY_LALT: case KEY_RALT: return ALT.GetValue();
@@ -151,13 +147,8 @@ RString InputHandler::GetLocalizedInputString( const DeviceInput &di )
case KEY_BACKSLASH: return BACKSLASH.GetValue(); case KEY_BACKSLASH: return BACKSLASH.GetValue();
default: default:
wchar_t c = DeviceButtonToChar(di.button,false); wchar_t c = DeviceButtonToChar(di.button,false);
if( c ) if( c && c != L' ' ) // Don't show "Key " for space.
{
if( c == L' ' )
return SPACE.GetValue(); // Don't show "Key " for space.
else
return Capitalize( WStringToRString(wstring()+c) ); return Capitalize( WStringToRString(wstring()+c) );
}
return DeviceButtonToString(di.button); return DeviceButtonToString(di.button);
} }