From 0a5256bb03d031f03a5fbe5148df36fc6e0f5bc7 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 15 Jun 2006 03:35:54 +0000 Subject: [PATCH] use DeviceInputToChar --- stepmania/src/ScreenNameEntryTraditional.cpp | 2 +- stepmania/src/ScreenNetSelectBase.cpp | 2 +- stepmania/src/ScreenNetSelectMusic.cpp | 2 +- stepmania/src/ScreenTextEntry.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp index 175654a530..13a126d3e5 100644 --- a/stepmania/src/ScreenNameEntryTraditional.cpp +++ b/stepmania/src/ScreenNameEntryTraditional.cpp @@ -519,7 +519,7 @@ void ScreenNameEntryTraditional::Input( const InputEventPlus &input ) } else { - wchar_t ch = INPUTMAN->DeviceButtonToChar(input.DeviceI.button,true); + wchar_t ch = INPUTMAN->DeviceInputToChar(input.DeviceI,true); MakeUpper( &ch, 1 ); c = ch; } diff --git a/stepmania/src/ScreenNetSelectBase.cpp b/stepmania/src/ScreenNetSelectBase.cpp index a668995e0e..d264adb5f1 100644 --- a/stepmania/src/ScreenNetSelectBase.cpp +++ b/stepmania/src/ScreenNetSelectBase.cpp @@ -120,7 +120,7 @@ void ScreenNetSelectBase::Input( const InputEventPlus &input ) break; default: wchar_t c; - c = INPUTMAN->DeviceButtonToChar(input.DeviceI.button,true); + c = INPUTMAN->DeviceInputToChar(input.DeviceI, true); if( (c >= ' ') && (!bHoldingCtrl) ) { diff --git a/stepmania/src/ScreenNetSelectMusic.cpp b/stepmania/src/ScreenNetSelectMusic.cpp index ab84b9ea03..164bfdafde 100644 --- a/stepmania/src/ScreenNetSelectMusic.cpp +++ b/stepmania/src/ScreenNetSelectMusic.cpp @@ -130,7 +130,7 @@ void ScreenNetSelectMusic::Input( const InputEventPlus &input ) INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_RCTRL)) || (!NSMAN->useSMserver); //If we are disconnected, assume no chatting - wchar_t c = INPUTMAN->DeviceButtonToChar(input.DeviceI.button,true); + wchar_t c = INPUTMAN->DeviceInputToChar(input.DeviceI,true); MakeUpper( &c, 1 ); if ( bHoldingCtrl && ( c >= 'A' ) && ( c <= 'Z' ) ) diff --git a/stepmania/src/ScreenTextEntry.cpp b/stepmania/src/ScreenTextEntry.cpp index 03df4d062f..f977d10707 100644 --- a/stepmania/src/ScreenTextEntry.cpp +++ b/stepmania/src/ScreenTextEntry.cpp @@ -183,7 +183,7 @@ void ScreenTextEntry::Input( const InputEventPlus &input ) } else if( input.type == IET_FIRST_PRESS ) { - wchar_t c = INPUTMAN->DeviceButtonToChar(input.DeviceI.button,true); + wchar_t c = INPUTMAN->DeviceInputToChar(input.DeviceI,true); if( c >= ' ' ) { TryAppendToAnswer( WStringToRString(wstring()+c) );