mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

Fixed screenshot keybinding, and make it bindable

Browse Source
This commit is contained in:
scrawl 2013-07-31 20:24:44 +02:00
parent aa835aa097
commit f1f6336a4a
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/openmw/mwinput/inputmanagerimp.cpp
View File

@ -844,8 +844,8 @@ namespace MWInput
defaultKeyBindings[A_QuickKey8] = SDLK_8; defaultKeyBindings[A_QuickKey8] = SDLK_8;
defaultKeyBindings[A_QuickKey9] = SDLK_9; defaultKeyBindings[A_QuickKey9] = SDLK_9;
defaultKeyBindings[A_QuickKey10] = SDLK_0; defaultKeyBindings[A_QuickKey10] = SDLK_0;
defaultKeyBindings[A_Screenshot] = SDLK_PRINTSCREEN; defaultKeyBindings[A_Screenshot] = SDLK_F12;
defaultKeyBindings[A_ToggleHUD] = SDLK_F12; defaultKeyBindings[A_ToggleHUD] = SDLK_F11;
defaultKeyBindings[A_AlwaysRun] = SDLK_y; defaultKeyBindings[A_AlwaysRun] = SDLK_y;
std::map<int, int> defaultMouseButtonBindings; std::map<int, int> defaultMouseButtonBindings;
@ -880,12 +880,20 @@ namespace MWInput
mInputBinder->addMouseButtonBinding (control, defaultMouseButtonBindings[i], ICS::Control::INCREASE); mInputBinder->addMouseButtonBinding (control, defaultMouseButtonBindings[i], ICS::Control::INCREASE);
} }
} }
// Printscreen key should not be allowed because it's captured by system screenshot function
// We check this explicitely here to fix up pre-0.26 config files. Can be removed after a few versions
if (mInputBinder->getKeyBinding(mInputBinder->getControl(A_Screenshot), ICS::Control::INCREASE) == SDLK_PRINTSCREEN)
mInputBinder->addKeyBinding(mInputBinder->getControl(A_Screenshot), SDLK_F12, ICS::Control::INCREASE);
} }
std::string InputManager::getActionDescription (int action) std::string InputManager::getActionDescription (int action)
{ {
std::map<int, std::string> descriptions; std::map<int, std::string> descriptions;
if (action == A_Screenshot)
return "Screenshot";
descriptions[A_Use] = "sUse"; descriptions[A_Use] = "sUse";
descriptions[A_Activate] = "sActivate"; descriptions[A_Activate] = "sActivate";
descriptions[A_MoveBackward] = "sBack"; descriptions[A_MoveBackward] = "sBack";
@ -958,6 +966,7 @@ namespace MWInput
ret.push_back(A_Journal); ret.push_back(A_Journal);
ret.push_back(A_Rest); ret.push_back(A_Rest);
ret.push_back(A_Console); ret.push_back(A_Console);
ret.push_back(A_Screenshot);
ret.push_back(A_QuickKeysMenu); ret.push_back(A_QuickKeysMenu);
ret.push_back(A_QuickKey1); ret.push_back(A_QuickKey1);
ret.push_back(A_QuickKey2); ret.push_back(A_QuickKey2);