1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 07:20:16 +00:00

More actor cleanup Part 3 (#118)

* 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

View file

@ -39,7 +39,7 @@ static InitChainEntry initChain[] = {
ICHAIN_F32(unk_F4, 2000, ICHAIN_STOP),
};
void ArrowLight_SetupAction(ArrowLight* this, ActorFunc* actionFunc) {
void ArrowLight_SetupAction(ArrowLight* this, ArrowLightActionFunc actionFunc) {
this->actionFunc = actionFunc;
}

View file

@ -4,7 +4,11 @@
#include <ultra64.h>
#include <global.h>
typedef struct {
struct ArrowLight;
typedef void (*ArrowLightActionFunc)(struct ArrowLight*, GlobalContext*);
typedef struct ArrowLight {
/* 0x0000 */ Actor actor;
/* 0x014C */ s16 radius;
/* 0x014E */ u16 timer;
@ -12,7 +16,7 @@ typedef struct {
/* 0x0154 */ Vec3f unkPos;
/* 0x0160 */ f32 unk_160;
/* 0x0164 */ f32 unk_164;
/* 0x0168 */ ActorFunc actionFunc;
/* 0x0168 */ ArrowLightActionFunc actionFunc;
} ArrowLight; // size = 0x016C
extern const ActorInit Arrow_Light_InitVars;