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

Fix knockout animation interruption/looping

Browse Source
This commit is contained in:
Alexei Kotov 2022-06-13 17:14:12 +03:00
parent b8018024a6
commit 253de65d13
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/openmw/mwmechanics/character.cpp
View File

@ -329,7 +329,6 @@ void CharacterController::refreshHitRecoilAnims(CharacterState& idle)
bool knockdown = stats.getKnockedDown();
bool block = stats.getBlock();
bool isSwimming = world->isSwimming(mPtr);
auto& prng = world->getPrng();
if (mHitState != CharState_None)
{
@ -341,29 +340,21 @@ void CharacterController::refreshHitRecoilAnims(CharacterState& idle)
stats.setHitRecovery(false);
stats.setBlock(false);
}
else if (isKnockedOut() && !knockout && mTimeUntilWake <= 0)
{
mAnimation->disable(mCurrentHit);
mAnimation->play(mCurrentHit, Priority_Knockdown, MWRender::Animation::BlendMask_All, true, 1, "loop stop", "stop", 0.0f, 0);
}
else if (isKnockedOut())
mAnimation->setLoopingEnabled(mCurrentHit, knockout);
return;
}
if (!knockout && !knockdown && !recovery && !block)
return;
if (knockout)
mTimeUntilWake = Misc::Rng::rollClosedProbability(prng) * 2 + 1; // Wake up after 1 to 3 seconds
MWRender::Animation::AnimPriority priority(Priority_Knockdown);
bool autodisable = true;
std::string startKey = "start";
std::string stopKey = "stop";
if (knockout)
{
mHitState = isSwimming ? CharState_SwimKnockOut : CharState_KnockOut;
stats.setKnockedDown(true);
autodisable = false;
}
else if (knockdown)
{
@ -420,7 +411,7 @@ void CharacterController::refreshHitRecoilAnims(CharacterState& idle)
}
}
mAnimation->play(mCurrentHit, priority, MWRender::Animation::BlendMask_All, autodisable, 1, startKey, stopKey, 0.0f, ~0ul);
mAnimation->play(mCurrentHit, priority, MWRender::Animation::BlendMask_All, true, 1, startKey, stopKey, 0.0f, ~0ul);
idle = CharState_None;
}
@ -1817,9 +1808,6 @@ void CharacterController::update(float duration)
updateMagicEffects();
if (isKnockedOut())
mTimeUntilWake -= duration;
bool isPlayer = mPtr == MWMechanics::getPlayer();
bool isFirstPersonPlayer = isPlayer && MWBase::Environment::get().getWorld()->isFirstPerson();
bool godmode = isPlayer && MWBase::Environment::get().getWorld()->getGodModeState();

2
apps/openmw/mwmechanics/character.hpp
View File

@ -190,8 +190,6 @@ class CharacterController : public MWRender::Animation::TextKeyListener
bool mCastingManualSpell{false};
float mTimeUntilWake{0.f};
bool mIsMovingBackward{false};
osg::Vec2f mSmoothedSpeed;