mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-03 23:26:40 +00:00
Code Issues Releases Wiki Activity

MR Comments

Browse source
This commit is contained in:
Mads Buvik Sandvei 2024-01-28 16:24:15 +01:00
parent 36e1bdab10
commit 993cea7d65
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2516,7 +2516,8 @@ namespace MWMechanics
{ {
AnimationQueueEntry entry; AnimationQueueEntry entry;
entry.mGroup = iter->mGroup; entry.mGroup = iter->mGroup;
entry.mLoopCount = iter->mLoopCount; entry.mLoopCount
= static_cast<uint32_t>(std::min<uint64_t>(iter->mLoopCount, std::numeric_limits<uint32_t>::max()));
entry.mLooping = mAnimation->isLoopingAnimation(entry.mGroup); entry.mLooping = mAnimation->isLoopingAnimation(entry.mGroup);
entry.mStartKey = "start"; entry.mStartKey = "start";
entry.mStopKey = "stop"; entry.mStopKey = "stop";
@ -2586,7 +2587,6 @@ namespace MWMechanics
// exactly x times, while non-actors will loop x+1 instead. // exactly x times, while non-actors will loop x+1 instead.
if (mPtr.getClass().isActor()) if (mPtr.getClass().isActor())
count--; count--;
count = std::max(count, 0u);
AnimationQueueEntry entry; AnimationQueueEntry entry;
entry.mGroup = groupname; entry.mGroup = groupname;
@ -2633,7 +2633,7 @@ namespace MWMechanics
entry.mGroup = groupname; entry.mGroup = groupname;
// Note: MWScript gives one less loop to actors than non-actors. // Note: MWScript gives one less loop to actors than non-actors.
// But this is the Lua version. We don't need to reproduce this weirdness here. // But this is the Lua version. We don't need to reproduce this weirdness here.
entry.mLoopCount = std::max(loops, 0u); entry.mLoopCount = loops;
entry.mStartKey = startKey; entry.mStartKey = startKey;
entry.mStopKey = stopKey; entry.mStopKey = stopKey;
entry.mLooping = mAnimation->isLoopingAnimation(groupname) || forceLoop; entry.mLooping = mAnimation->isLoopingAnimation(groupname) || forceLoop;