mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-05-29 08:43:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup around some generic animation info structs (#1059)

Browse Source 
* Name generic anim info structs and cleanup usage

* Make `EnDaiku` use generic struct

* Add `/* decimalid */` comments to all added enums

* small fixes

* Two more generic animinfo structs

* Cleanup usage of newly generic structs

* Cleanup x2 usage of newly generic structs

* `transitionRate` -> `morphFrames`

* Properly name generic anim structs (attempt to at least)

* `anim` -> `animation`

* fixes

* run formatter

* Use consistent prototypes for each actor's ChangeAnim helper

* run formatter

* minor cleanup

* Run formatter

* `Animation_ChangeInfo` -> `Animation_ChangeByInfo`
This commit is contained in:
Dragorn421
2022-01-12 03:10:43 +01:00
committed by GitHub
parent d3a8ade6ba
commit 11917bf640
31 changed files with 675 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_actor.c
+7 -7
View File
@@ -3857,19 +3857,19 @@ s16 func_80034DD4(Actor* actor, GlobalContext* globalCtx, s16 arg2, f32 arg3) {
return arg2;
}
void func_80034EC0(SkelAnime* skelAnime, struct_80034EC0_Entry* animations, s32 index) {
void Animation_ChangeByInfo(SkelAnime* skelAnime, AnimationInfo* animationInfo, s32 index) {
f32 frameCount;
animations += index;
animationInfo += index;
if (animations->frameCount > 0.0f) {
frameCount = animations->frameCount;
if (animationInfo->frameCount > 0.0f) {
frameCount = animationInfo->frameCount;
} else {
frameCount = Animation_GetLastFrame(animations->animation);
frameCount = Animation_GetLastFrame(animationInfo->animation);
}
Animation_Change(skelAnime, animations->animation, animations->playbackSpeed, animations->startFrame, frameCount,
animations->mode, animations->transitionRate);
Animation_Change(skelAnime, animationInfo->animation, animationInfo->playSpeed, animationInfo->startFrame,
frameCount, animationInfo->mode, animationInfo->morphFrames);
}
void func_80034F54(GlobalContext* globalCtx, s16* arg1, s16* arg2, s32 arg3) {