mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-20 09:11:35 +00:00
Code Issues Releases Wiki Activity

Restart player block animation during blocking if necessary

Browse source
This commit is contained in:
Alexei Kotov 2022-11-07 21:20:16 +03:00
parent 180963488f
commit 1db9247c45
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/openmw/mwmechanics/character.cpp
View file

@ -385,9 +385,17 @@ namespace MWMechanics
bool knockout = stats.getFatigue().getCurrent() < 0 || stats.getFatigue().getBase() == 0; bool knockout = stats.getFatigue().getCurrent() < 0 || stats.getFatigue().getBase() == 0;
bool recovery = stats.getHitRecovery(); bool recovery = stats.getHitRecovery();
bool knockdown = stats.getKnockedDown(); bool knockdown = stats.getKnockedDown();
bool block = stats.getBlock(); bool block = stats.getBlock() && !knockout && !recovery && !knockdown;
bool isSwimming = world->isSwimming(mPtr); bool isSwimming = world->isSwimming(mPtr);
stats.setBlock(false);
if (mPtr == getPlayer() && mHitState == CharState_Block && block)
{
mHitState = CharState_None;
resetCurrentIdleState();
}
if (mHitState != CharState_None) if (mHitState != CharState_None)
{ {
if (!mAnimation->isPlaying(mCurrentHit)) if (!mAnimation->isPlaying(mCurrentHit))
@ -396,7 +404,6 @@ namespace MWMechanics
mCurrentHit.clear(); mCurrentHit.clear();
stats.setKnockedDown(false); stats.setKnockedDown(false);
stats.setHitRecovery(false); stats.setHitRecovery(false);
stats.setBlock(false);
resetCurrentIdleState(); resetCurrentIdleState();
} }
else if (isKnockedOut()) else if (isKnockedOut())
@ -451,7 +458,6 @@ namespace MWMechanics
mCurrentHit.clear(); mCurrentHit.clear();
stats.setKnockedDown(false); stats.setKnockedDown(false);
stats.setHitRecovery(false); stats.setHitRecovery(false);
stats.setBlock(false);
resetCurrentIdleState(); resetCurrentIdleState();
return; return;
} }