summaryrefslogtreecommitdiff
path: root/src/code/z_skelanime.c
diff options
context:
space:
mode:
authorZach Banks <zjbanks@gmail.com>2021-05-18 22:28:04 -0400
committerGitHub <noreply@github.com>2021-05-18 22:28:04 -0400
commitdea3c8fd792d29648697f697f34d3658bf3838cf (patch)
tree44343b1d23b9eb7f9fc1598da7a7f804528db204 /src/code/z_skelanime.c
parent7f1465991925a27539a1bd5361331b794772efb2 (diff)
Fix all warnings raised by IDO (#152)
* Fix all warnings raised by IDO, ignore trailing commas * Set -woff=624,...; keep const in printf functions * Remove redefined macros in irqmgr.c * Remove DECR macro & reformat * Address PR comments from AngheloAlf
Diffstat (limited to 'src/code/z_skelanime.c')
-rw-r--r--src/code/z_skelanime.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c
index 16e1f3b11..a22306dbc 100644
--- a/src/code/z_skelanime.c
+++ b/src/code/z_skelanime.c
@@ -19,8 +19,9 @@ void SkelAnime_AnimationType4Loaded(GlobalContext* globalCtx, AnimationEntryType
void SkelAnime_AnimationType5Loaded(GlobalContext* globalCtx, AnimationEntryType5* entry);
static AnimationEntryCallback sAnimationLoadDone[] = {
- SkelAnime_LinkAnimetionLoaded, SkelAnime_AnimationType1Loaded, SkelAnime_AnimationType2Loaded,
- SkelAnime_AnimationType3Loaded, SkelAnime_AnimationType4Loaded, SkelAnime_AnimationType5Loaded,
+ (AnimationEntryCallback)SkelAnime_LinkAnimetionLoaded, (AnimationEntryCallback)SkelAnime_AnimationType1Loaded,
+ (AnimationEntryCallback)SkelAnime_AnimationType2Loaded, (AnimationEntryCallback)SkelAnime_AnimationType3Loaded,
+ (AnimationEntryCallback)SkelAnime_AnimationType4Loaded, (AnimationEntryCallback)SkelAnime_AnimationType5Loaded,
};
s32 D_801F5AB0;
@@ -1240,7 +1241,7 @@ void SkelAnime_ChangeLinkAnim(GlobalContext* globalCtx, SkelAnime* skelAnime, Li
skelAnime->initialFrame = frame;
skelAnime->animCurrentFrame = frame;
skelAnime->animFrameCount = frameCount;
- skelAnime->totalFrames = SkelAnime_GetTotalFrames(linkAnimetionEntrySeg);
+ skelAnime->totalFrames = SkelAnime_GetTotalFrames(&linkAnimetionEntrySeg->genericHeader);
skelAnime->animPlaybackSpeed = playbackSpeed;
}