mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-20 22:11:16 +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

5
src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c
View file

@ -15,7 +15,6 @@ void BgPushbox_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgPushbox_Update(Actor* thisx, GlobalContext* globalCtx);
void BgPushbox_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_808A8AE0(BgPushbox* this, ActorFunc actionFunc);
void func_808A8BAC(BgPushbox* this, GlobalContext* globalCtx);
const ActorInit Bg_Pushbox_InitVars = {
@ -37,7 +36,7 @@ static InitChainEntry initChain[] = {
ICHAIN_F32_DIV1000(gravity, -2000, ICHAIN_STOP),
};
void func_808A8AE0(BgPushbox* this, ActorFunc actionFunc) {
void BgPushbox_SetupAction(BgPushbox* this, BgPushboxActionFunc actionFunc) {
this->actionFunc = actionFunc;
}
@ -52,7 +51,7 @@ void BgPushbox_Init(Actor* thisx, GlobalContext* globalCtx) {
DynaPolyInfo_Alloc(&D_06000350, &local_c);
this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, thisx, local_c);
ActorShape_Init(&thisx->shape, 0.0f, NULL, 0.0f);
func_808A8AE0(this, &func_808A8BAC);
BgPushbox_SetupAction(this, func_808A8BAC);
}
void BgPushbox_Destroy(Actor* thisx, GlobalContext* globalCtx) {

8
src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.h
View file

@ -4,9 +4,13 @@
#include <ultra64.h>
#include <global.h>
typedef struct {
struct BgPushbox;
typedef void (*BgPushboxActionFunc)(struct BgPushbox*, GlobalContext*);
typedef struct BgPushbox {
/* 0x0000 */ DynaPolyActor dyna;
/* 0x0164 */ ActorFunc actionFunc;
/* 0x0164 */ BgPushboxActionFunc actionFunc;
} BgPushbox; // size = 0x0168
extern const ActorInit Bg_Pushbox_InitVars;