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

@ -10,8 +10,6 @@
#define FLAGS 0x00000010
#define THIS ((ObjLift*)thisx)
void ObjLift_Init(Actor* thisx, GlobalContext* globalCtx);
void ObjLift_Destroy(Actor* thisx, GlobalContext* globalCtx);
void ObjLift_Update(Actor* thisx, GlobalContext* globalCtx);
@ -106,7 +104,7 @@ void func_80B96160(ObjLift* this, GlobalContext* globalCtx) {
}
void ObjLift_Init(Actor* thisx, GlobalContext* globalCtx) {
ObjLift* this = THIS;
ObjLift* this = (ObjLift*)thisx;
ObjLift_InitDynaPoly(this, globalCtx, &gCollapsingPlatformCol, DPM_PLAYER);
@ -125,7 +123,7 @@ void ObjLift_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void ObjLift_Destroy(Actor* thisx, GlobalContext* globalCtx) {
ObjLift* this = THIS;
ObjLift* this = (ObjLift*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -209,7 +207,7 @@ void func_80B96840(ObjLift* this, GlobalContext* globalCtx) {
}
void ObjLift_Update(Actor* thisx, GlobalContext* globalCtx) {
ObjLift* this = THIS;
ObjLift* this = (ObjLift*)thisx;
if (this->timer > 0) {
this->timer--;