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

More actor cleanup Part 3 (#118)

Browse source 
* Add custom types for actor specific functions (like actions)

* Add a forward struct declaration for all other actors
This commit is contained in:
Roman971 2020-05-06 00:53:15 +02:00 • committed by GitHub
parent f114df8929
commit 1425678d8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
477 changed files with 1817 additions and 792 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/overlays/actors/ovl_En_Ma2/z_en_ma2.c
View file

@ -247,11 +247,11 @@ void EnMa2_Init(Actor* thisx, GlobalContext* globalCtx) {
switch (func_80AA1B58(this, globalCtx)) {
case 1:
func_80AA1D44(this, 2);
this->actionFunc = (ActorFunc)func_80AA2018;
this->actionFunc = func_80AA2018;
break;
case 2:
func_80AA1D44(this, 3);
this->actionFunc = (ActorFunc)func_80AA204C;
this->actionFunc = func_80AA204C;
break;
case 3:
if (gSaveContext.infTable[8] & 0x2000) {
@ -259,7 +259,7 @@ void EnMa2_Init(Actor* thisx, GlobalContext* globalCtx) {
} else {
func_80AA1D44(this, 3);
}
this->actionFunc = (ActorFunc)func_80AA2018;
this->actionFunc = func_80AA2018;
break;
case 0:
Actor_Kill(&this->actor);
@ -293,7 +293,7 @@ void func_80AA204C(EnMa2* this, GlobalContext* globalCtx) {
player->unk_6A8 = &this->actor;
player->stateFlags2 |= 0x2000000;
func_8010BD58(globalCtx, 0x23);
this->actionFunc = (ActorFunc)func_80AA20E4;
this->actionFunc = func_80AA20E4;
} else if (this->actor.xzDistanceFromLink < 30.0f + (f32)this->collider.dim.radius) {
player->stateFlags2 |= 0x800000;
}
@ -303,13 +303,13 @@ void func_80AA20E4(EnMa2* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
if (globalCtx->msgCtx.unk_E3EE >= 4) {
this->actionFunc = (ActorFunc)func_80AA204C;
this->actionFunc = func_80AA204C;
globalCtx->msgCtx.unk_E3EE = 4;
} else if (globalCtx->msgCtx.unk_E3EE == 3) {
Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
this->unk_208 = 0x1E;
gSaveContext.infTable[8] |= 0x4000;
this->actionFunc = (ActorFunc)func_80AA21C8;
this->actionFunc = func_80AA21C8;
globalCtx->msgCtx.unk_E3EE = 4;
} else {
player->stateFlags2 |= 0x800000;
@ -327,7 +327,7 @@ void func_80AA21C8(EnMa2* this, GlobalContext* globalCtx) {
func_80106CCC(globalCtx);
} else {
this->actor.flags &= ~0x10000;
this->actionFunc = (ActorFunc)func_80AA2018;
this->actionFunc = func_80AA2018;
}
}
}
@ -343,7 +343,7 @@ void EnMa2_Update(Actor* thisx, GlobalContext* globalCtx) {
this->actionFunc(this, globalCtx);
func_80AA1DB4(this, globalCtx);
func_80AA1AE4(this, globalCtx);
if (this->actionFunc != (ActorFunc)func_80AA20E4) {
if (this->actionFunc != func_80AA20E4) {
func_800343CC(globalCtx, &this->actor, &this->unk_1E0.unk_00, (f32)this->collider.dim.radius + 30.0f,
func_80AA19A0, func_80AA1A38);
}

8
src/overlays/actors/ovl_En_Ma2/z_en_ma2.h
View file

@ -4,10 +4,14 @@
#include <ultra64.h>
#include <global.h>
typedef struct {
struct EnMa2;
typedef void (*EnMa2ActionFunc)(struct EnMa2*, GlobalContext*);
typedef struct EnMa2 {
/* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime;
/* 0x0190 */ ActorFunc actionFunc;
/* 0x0190 */ EnMa2ActionFunc actionFunc;
/* 0x0194 */ ColliderCylinder collider;
/* 0x01E0 */ struct_80034A14_arg1 unk_1E0;
/* 0x0208 */ s16 unk_208;