funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2026-03-27 06:12:47 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

17
RetroFE/Source/Control/UserInput.cpp
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
@@ -128,19 +128,18 @@ bool UserInput::MapKey(std::string keyDescription, KeyCode_E key)
bool UserInput::SetKeyState(SDL_Scancode code, bool state) 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;
} }
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];
} }

2
RetroFE/Source/RetroFE.cpp
View File

@@ -419,7 +419,7 @@ RetroFE::RETROFE_STATE RetroFE::ProcessUserInput(Page *page)
} }
if (Input.GetKeyState(UserInput::KeyCodeDown)) if (Input.GetKeyState(UserInput::KeyCodeDown))
{ {
page->SetScrolling(Page::ScrollDirectionForward); page->SetScrolling(Page::ScrollDirectionForward);
} }
} }
if (Input.GetKeyState(UserInput::KeyCodePageUp)) if (Input.GetKeyState(UserInput::KeyCodePageUp))