mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-07 06:40:15 +00:00
Code Issues Projects Releases Wiki Activity

clang formatting

Browse source
This commit is contained in:
KrimtonZ 2020-03-25 11:07:09 -05:00
parent 18676c531d
commit 095924d05a
4 changed files with 79 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/overlays/actors/ovl_Demo_Go/z_demo_go.c
View file

@ -248,8 +248,8 @@ void func_8097CEEC(DemoGo* this, GlobalContext* globalCtx) {
void func_8097CF20(DemoGo* this, GlobalContext* globalCtx, UNK_TYPE arg2) {
AnimationHeader* animation = &D_060029A8;
if (arg2 != 0) {
SkelAnime_ChangeAnimation(&this->skelAnime, animation, 1.0f, 0.0f, SkelAnime_GetFrameCount(&animation->genericHeader), 0,
-8.0f);
SkelAnime_ChangeAnimation(&this->skelAnime, animation, 1.0f, 0.0f,
SkelAnime_GetFrameCount(&animation->genericHeader), 0, -8.0f);
this->action = 5;
this->unk_19C = 0.0f;
}
@ -321,7 +321,8 @@ void DemoGo_Init(DemoGo* this, GlobalContext* globalCtx) {
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f);
SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600FEF0, NULL, NULL, NULL, 0);
SkelAnime_ChangeAnimation(&this->skelAnime, animation, 1.0f, 0.0f, SkelAnime_GetFrameCount(&animation->genericHeader), 2, 0.0f);
SkelAnime_ChangeAnimation(&this->skelAnime, animation, 1.0f, 0.0f,
SkelAnime_GetFrameCount(&animation->genericHeader), 2, 0.0f);
this->action = 0;
}

4
src/overlays/actors/ovl_En_Tk/z_en_tk.c
View file

@ -509,8 +509,8 @@ void EnTk_Init(EnTk* this, GlobalContext* globalCtx) {
ActorShape_Init(&thisAgain->actor.shape, 0, ActorShadow_DrawFunc_Circle, 24.f);
SkelAnime_InitSV(globalCtx, &thisAgain->skelAnim, &D_0600BE40, NULL, thisAgain->hz_22A, thisAgain->hz_296, 18);
SkelAnime_ChangeAnimation(&thisAgain->skelAnim, anim, 1.f, 0.f, SkelAnime_GetFrameCount(&D_06002F84.genericHeader), 0,
0.f);
SkelAnime_ChangeAnimation(&thisAgain->skelAnim, anim, 1.f, 0.f, SkelAnime_GetFrameCount(&D_06002F84.genericHeader),
0, 0.f);
ActorCollider_AllocCylinder(globalCtx, &thisAgain->collider);
ActorCollider_InitCylinder(globalCtx, &thisAgain->collider, &thisAgain->actor, &D_80B1D508);