mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 20:26:43 +00:00
Code Issues Releases Wiki Activity

[Fixes #4482] Missing HandToHand on key quick key 0 (introduced in MR !11 for issue #4480)

Browse source 
because apparently i can't count to ten...
This commit is contained in:
Finbar Crago 2018-07-01 13:46:23 +10:00
parent 3660d55adf
commit 5d9035c6b2
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/openmw/mwgui/quickkeysmenu.cpp
View file

@ -124,7 +124,7 @@ namespace MWGui
while (key->button->getChildCount()) // Destroy number label
MyGUI::Gui::getInstance().destroyWidget(key->button->getChildAt(0));
if (key->index == 9)
if (key->index == 10)
{
key->type = Type_HandToHand;
@ -163,6 +163,10 @@ namespace MWGui
assert(index != -1);
mSelected = &mKey[index];
// prevent reallocation of zero key from Type_HandToHand
if(mSelected->index == 10)
return;
// open assign dialog
if (!mAssignDialog)
mAssignDialog = new QuickKeysMenuAssign(this);
@ -304,7 +308,7 @@ namespace MWGui
void QuickKeysMenu::activateQuickKey(int index)
{
assert(index >= 1 && index <= 9);
assert(index >= 1 && index <= 10);
keyData *key = &mKey[index-1];