mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-09 13:45:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Animation Cleanup Part 1: Dm Actors (#1290)

Browse Source 
* DM cleanup

* cleanup

* fix pointer

* rm unused anim enum

* PR Suggestions

* spacing

* missed one

* More PR Suggestions

* oops
This commit is contained in:
engineer124
2023-07-11 00:00:42 +10:00
committed by GitHub
parent b3eae0e5b7
commit 82318a1c1b
33 changed files with 1209 additions and 767 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_actor.c
+9 -8
View File
@@ -4451,18 +4451,19 @@ s16 func_800BDB6C(Actor* actor, PlayState* play, s16 arg2, f32 arg3) {
return arg2;
}
void Actor_ChangeAnimationByInfo(SkelAnime* skelAnime, AnimationInfo* animationInfo, s32 animIndex) {
f32 frameCount;
void Actor_ChangeAnimationByInfo(SkelAnime* skelAnime, AnimationInfo* animInfo, s32 animIndex) {
f32 endFrame;
animationInfo += animIndex;
if (animationInfo->frameCount > 0.0f) {
frameCount = animationInfo->frameCount;
animInfo += animIndex;
if (animInfo->frameCount > 0.0f) {
endFrame = animInfo->frameCount;
} else {
frameCount = Animation_GetLastFrame(&animationInfo->animation->common);
endFrame = Animation_GetLastFrame(&animInfo->animation->common);
}
Animation_Change(skelAnime, animationInfo->animation, animationInfo->playSpeed, animationInfo->startFrame,
frameCount, animationInfo->mode, animationInfo->morphFrames);
Animation_Change(skelAnime, animInfo->animation, animInfo->playSpeed, animInfo->startFrame, endFrame,
animInfo->mode, animInfo->morphFrames);
}
/**