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

Remove THIS macro (#1047)

* remove THIS

* fix

* forgot dorf
This commit is contained in:
fig02 2021-12-04 11:33:00 -05:00 committed by GitHub
parent 68899c2e33
commit e635e34265
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
433 changed files with 1996 additions and 2859 deletions

View file

@ -9,8 +9,6 @@
#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);
@ -41,7 +39,7 @@ void BgPushbox_SetupAction(BgPushbox* this, BgPushboxActionFunc actionFunc) {
void BgPushbox_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgPushbox* this = THIS;
BgPushbox* this = (BgPushbox*)thisx;
CollisionHeader* colHeader = NULL;
s32 pad2;
@ -54,7 +52,7 @@ void BgPushbox_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgPushbox_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgPushbox* this = THIS;
BgPushbox* this = (BgPushbox*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -71,7 +69,7 @@ void BgPushbox_UpdateImpl(BgPushbox* this, GlobalContext* globalCtx) {
}
void BgPushbox_Update(Actor* thisx, GlobalContext* globalCtx) {
BgPushbox* this = THIS;
BgPushbox* this = (BgPushbox*)thisx;
this->actionFunc(this, globalCtx);
func_8002DF90(&this->dyna);