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

Merged pull request #1827

Browse Source
This commit is contained in:
Marc Zinnschlag 2018-07-29 12:52:51 +02:00
commit 9e6cba09a6
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/openmw/mwgui/quickkeysmenu.cpp
View File

@ -324,15 +324,19 @@ namespace MWGui
bool isReturnNeeded = playerStats.isParalyzed() || playerStats.isDead(); bool isReturnNeeded = playerStats.isParalyzed() || playerStats.isDead();
if (isReturnNeeded) if (isReturnNeeded && key->type != Type_Item)
{
return; return;
}
else if (isDelayNeeded) else if (isDelayNeeded && key->type != Type_Item)
{
mActivated = key; mActivated = key;
return;
}
else else
{
mActivated = nullptr; mActivated = nullptr;
}
if (key->type == Type_Item || key->type == Type_MagicItem) if (key->type == Type_Item || key->type == Type_MagicItem)
{ {
@ -370,6 +374,11 @@ namespace MWGui
// delay weapon switching if player is busy // delay weapon switching if player is busy
if (isDelayNeeded && (isWeapon || isTool)) if (isDelayNeeded && (isWeapon || isTool))
{
mActivated = key;
return;
}
else if (isReturnNeeded && (isWeapon || isTool))
{ {
return; return;
} }