shweet/shweets-sim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

animation fixes + modding WIP
Some checks failed
Build / Build Game (push) Has been cancelled
Details

Browse Source
This commit is contained in:
shweet
2026-03-01 19:07:01 -05:00
parent 6ed9a15177
commit 06d2cbdc12
8 changed files with 404 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/entity/actor.cpp
View File

@@ -240,7 +240,7 @@ namespace game::entity
auto& index = animationMap.at(queuedPlay.animation);
if (queuedPlay.isPlayAfterAnimation)
nextQueuedPlay = queuedPlay;
else if (index != animationIndex && currentQueuedPlay.isInterruptible)
else if ((state == STOPPED || index != animationIndex) && currentQueuedPlay.isInterruptible)
{
play(queuedPlay.animation, queuedPlay.mode, queuedPlay.time, queuedPlay.speedMultiplier);
currentQueuedPlay = queuedPlay;

2
src/entity/character.cpp
View File

@@ -189,7 +189,7 @@ namespace game::entity
isStageUp = false;
}
if (nextQueuedPlay.empty()) queue_idle_animation();
if (nextQueuedPlay.empty() && !isTalking) queue_idle_animation();
}
Actor::tick();