more obvious behavior, and change "Joy1_B1" to "Joy1 B1" for

consistency
2006-06-15 06:34:07 +00:00
parent 0b1eedce2c
commit 1157c5eae9
1 changed files with 5 additions and 1 deletions
@@ -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 )