diff --git a/stepmania/src/ScreenTextEntry.cpp b/stepmania/src/ScreenTextEntry.cpp index 06234d711b..4ceda2cd2e 100644 --- a/stepmania/src/ScreenTextEntry.cpp +++ b/stepmania/src/ScreenTextEntry.cpp @@ -101,7 +101,7 @@ void ScreenTextEntry::Input( const DeviceInput& DeviceI, const InputEventType ty { bool nextChar = false; - int toAdd = VIRTUALKB.Translate(DeviceI, MenuI, m_sAnswer, &nextChar); + wchar_t toAdd = VIRTUALKB.Translate(DeviceI, MenuI, m_sAnswer, &nextChar); if( toAdd != 0 && toAdd != KEY_BACK && toAdd != KEY_ESC && toAdd != KEY_ENTER ) { diff --git a/stepmania/src/VirtualKeyboard.cpp b/stepmania/src/VirtualKeyboard.cpp index 7ff688b1df..a73e494085 100644 --- a/stepmania/src/VirtualKeyboard.cpp +++ b/stepmania/src/VirtualKeyboard.cpp @@ -24,7 +24,7 @@ void VirtualKeyboard::Reset( VirtualKeyboardMode mode ) currentMode = mode; } -int VirtualKeyboard::Translate( const DeviceInput& DeviceI, const MenuInput &MenuI, const wstring &cur_string, bool *nextChar ) +wchar_t VirtualKeyboard::Translate( const DeviceInput& DeviceI, const MenuInput &MenuI, const wstring &cur_string, bool *nextChar ) { *nextChar = false; MenuButton button = MenuI.button; @@ -48,7 +48,7 @@ int VirtualKeyboard::Translate( const DeviceInput& DeviceI, const MenuInput &Men } else { - int c = cur_string[cur_string.size() - 1]; + wchar_t c = cur_string[cur_string.size() - 1]; if(c == ' ') c = 'a'; @@ -85,7 +85,7 @@ int VirtualKeyboard::Translate( const DeviceInput& DeviceI, const MenuInput &Men } else { - int c = cur_string[cur_string.size() - 1]; + wchar_t c = cur_string[cur_string.size() - 1]; if(c == ' ') c = '~'; diff --git a/stepmania/src/VirtualKeyboard.h b/stepmania/src/VirtualKeyboard.h index 409c289474..014b207b3b 100644 --- a/stepmania/src/VirtualKeyboard.h +++ b/stepmania/src/VirtualKeyboard.h @@ -15,7 +15,7 @@ public: ~VirtualKeyboard(); void Reset( VirtualKeyboardMode mode ); - int Translate( const DeviceInput& DeviceI, const MenuInput &MenuI, const wstring &cur_string, bool *nextChar ); + wchar_t Translate( const DeviceInput& DeviceI, const MenuInput &MenuI, const wstring &cur_string, bool *nextChar ); protected: VirtualKeyboardMode currentMode;