Nested loops were simple.

This commit is contained in:
Jason Felds
2013-04-30 23:03:45 -04:00
parent 860699988b
commit 438d7a5305
@@ -846,14 +846,14 @@ wchar_t InputHandler_DInput::DeviceButtonToChar( DeviceButton button, bool bUseC
return '\0'; return '\0';
} }
FOREACH_CONST( DIDevice, Devices, d ) for (DIDevice const &d : Devices)
{ {
if( d->type != DIDevice::KEYBOARD ) if( d.type != DIDevice::KEYBOARD )
continue; continue;
FOREACH_CONST( input_t, d->Inputs, i ) for (input_t const &i : d.Inputs)
{ {
if( button != i->num ) if( button != i.num )
continue; continue;
unsigned char keys[256]; unsigned char keys[256];
@@ -861,7 +861,7 @@ wchar_t InputHandler_DInput::DeviceButtonToChar( DeviceButton button, bool bUseC
if( bUseCurrentKeyModifiers ) if( bUseCurrentKeyModifiers )
GetKeyboardState(keys); GetKeyboardState(keys);
// todo: handle Caps Lock -freem // todo: handle Caps Lock -freem
wchar_t c = ScancodeAndKeysToChar( i->ofs, keys ); wchar_t c = ScancodeAndKeysToChar( i.ofs, keys );
if( c ) if( c )
return c; return c;
} }