use DeviceInputToChar
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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) )
|
||||
{
|
||||
|
||||
@@ -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' ) )
|
||||
|
||||
@@ -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) );
|
||||
|
||||
Reference in New Issue
Block a user