Fix quick key activation delay code (regression #4536)

remotes/1728160796594174844/tmp_0.7.0-alpha
Capostrophic 7 years ago committed by Capostrophic
parent 29a1899045
commit 9c8e284ead

@ -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;
} }

Loading…
Cancel
Save