From 1157c5eae9ee1158ca48adfc378b635096921ccd Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 15 Jun 2006 06:34:07 +0000 Subject: [PATCH] more obvious behavior, and change "Joy1_B1" to "Joy1 B1" for consistency --- stepmania/src/arch/InputHandler/InputHandler.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/stepmania/src/arch/InputHandler/InputHandler.cpp b/stepmania/src/arch/InputHandler/InputHandler.cpp index 825d12cda6..16c3711a36 100644 --- a/stepmania/src/arch/InputHandler/InputHandler.cpp +++ b/stepmania/src/arch/InputHandler/InputHandler.cpp @@ -117,6 +117,9 @@ static LocalizedString BACKSLASH ( "DeviceButton", "Backslash" ); RString InputHandler::GetDeviceSpecificInputString( const DeviceInput &di ) { + if( di.device == DEVICE_NONE ) + return RString(); + if( di.device == DEVICE_KEYBOARD ) { wchar_t c = DeviceButtonToChar( di.button, false ); @@ -125,7 +128,8 @@ RString InputHandler::GetDeviceSpecificInputString( const DeviceInput &di ) return DeviceButtonToString( di.button ); } - return di.ToString(); + RString s = InputDeviceToString(di.device) + " " + DeviceButtonToString(di.button); + return s; } RString InputHandler::GetLocalizedInputString( const DeviceInput &di )