Fix issue where letterUp and letterDown are not specified in controls.conf.

This commit is contained in:
Don Honerbrink 2015-05-29 08:37:14 -05:00
parent 24db185788
commit cacbf1265e
2 changed files with 9 additions and 10 deletions

View File

@ -51,8 +51,8 @@ bool UserInput::Initialize()
retVal = MapKey("pageDown", KeyCodePageDown) && retVal; retVal = MapKey("pageDown", KeyCodePageDown) && retVal;
retVal = MapKey("pageUp", KeyCodePageUp) && retVal; retVal = MapKey("pageUp", KeyCodePageUp) && retVal;
retVal = MapKey("letterDown", KeyCodeLetterDown) && retVal; retVal = MapKey("letterDown", KeyCodeLetterDown) && retVal;
retVal = MapKey("letterUp", KeyCodeLetterUp) && retVal; MapKey("letterUp", KeyCodeLetterUp);
retVal = MapKey("select", KeyCodeSelect) && retVal; MapKey("select", KeyCodeSelect);
retVal = MapKey("back", KeyCodeBack) && retVal; retVal = MapKey("back", KeyCodeBack) && retVal;
retVal = MapKey("quit", KeyCodeQuit) && retVal; retVal = MapKey("quit", KeyCodeQuit) && retVal;
// these features will need to be implemented at a later time // these features will need to be implemented at a later time
@ -130,10 +130,8 @@ bool UserInput::SetKeyState(SDL_Scancode code, bool state)
{ {
KeyCode_E key = GetKeycode(code); KeyCode_E key = GetKeycode(code);
if(key == KeyCodeNull) if(key == KeyCodeNull) { return false; }
{ if(KeyState.find(key) == KeyState.end()) { return false; }
return false;
}
KeyState[key] = state; KeyState[key] = state;
return true; return true;
@ -141,6 +139,7 @@ bool UserInput::SetKeyState(SDL_Scancode code, bool state)
} }
bool UserInput::GetKeyState(KeyCode_E key) bool UserInput::GetKeyState(KeyCode_E key)
{ {
if(KeyState.find(key) == KeyState.end()) { return false; }
return KeyState[key]; return KeyState[key];
} }