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

More actor cleanup Part 2 (#116)

Browse source 
* Change all main actor functions to take a 'Actor* thisx' argument

* Change all actor callbacks to also take a 'Actor* thisx' argument
This commit is contained in:
Roman971 2020-05-04 21:02:51 +02:00 • committed by GitHub
parent 8efddb0fe0
commit f114df8929
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
429 changed files with 3689 additions and 2523 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,12 +8,15 @@
#define FLAGS 0x00000000
#define THIS ((BgPushbox*)thisx)
void BgPushbox_Init(Actor* thisx, GlobalContext* globalCtx);
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 BgPushbox_Init(BgPushbox* this, GlobalContext* globalCtx);
void BgPushbox_Destroy(BgPushbox* this, GlobalContext* globalCtx);
void func_808A8BAC(BgPushbox* this, GlobalContext* globalCtx);
void BgPushbox_Update(BgPushbox* this, GlobalContext* globalCtx);
void BgPushbox_Draw(BgPushbox* this, GlobalContext* globalCtx);
const ActorInit Bg_Pushbox_InitVars = {
ACTOR_BG_PUSHBOX,
@ -38,10 +41,11 @@ void func_808A8AE0(BgPushbox* this, ActorFunc actionFunc) {
this->actionFunc = actionFunc;
}
void BgPushbox_Init(BgPushbox* this, GlobalContext* globalCtx) {
s32 pad[2];
void BgPushbox_Init(Actor* thisx, GlobalContext* globalCtx) {
BgPushbox* this = THIS;
s32 pad;
u32 local_c = 0;
Actor* thisx = &this->dyna.actor;
s32 pad2;
Actor_ProcessInitChain(thisx, initChain);
DynaPolyInfo_SetActorMove(&this->dyna, 0);
@ -51,7 +55,9 @@ void BgPushbox_Init(BgPushbox* this, GlobalContext* globalCtx) {
func_808A8AE0(this, &func_808A8BAC);
}
void BgPushbox_Destroy(BgPushbox* this, GlobalContext* globalCtx) {
void BgPushbox_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgPushbox* this = THIS;
DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId);
}
@ -66,12 +72,14 @@ void func_808A8BAC(BgPushbox* this, GlobalContext* globalCtx) {
func_8002E4B4(globalCtx, thisx, 20.0f, 40.0f, 40.0f, 0x1D);
}
void BgPushbox_Update(BgPushbox* this, GlobalContext* globalCtx) {
void BgPushbox_Update(Actor* thisx, GlobalContext* globalCtx) {
BgPushbox* this = THIS;
this->actionFunc(this, globalCtx);
func_8002DF90(this);
}
void BgPushbox_Draw(BgPushbox* this, GlobalContext* globalCtx) {
void BgPushbox_Draw(Actor* thisx, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[5];