1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-20 22:11:16 +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 0x00000009
#define THIS ((EnGb*)thisx)
void EnGb_Init(Actor* thisx, GlobalContext* globalCtx);
void EnGb_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnGb_Update(Actor* thisx, GlobalContext* globalCtx);
@ -151,7 +149,7 @@ void func_80A2F180(EnGb* this) {
}
void EnGb_Init(Actor* thisx, GlobalContext* globalCtx) {
EnGb* this = THIS;
EnGb* this = (EnGb*)thisx;
s32 pad;
CollisionHeader* colHeader = NULL;
s32 i;
@ -218,7 +216,7 @@ void EnGb_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void EnGb_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnGb* this = THIS;
EnGb* this = (EnGb*)thisx;
Collider_DestroyCylinder(globalCtx, &this->collider);
LightContext_RemoveLight(globalCtx, &globalCtx->lightCtx, this->light);
@ -396,7 +394,7 @@ void func_80A2FC70(EnGb* this, GlobalContext* globalCtx) {
}
void EnGb_Update(Actor* thisx, GlobalContext* globalCtx2) {
EnGb* this = THIS;
EnGb* this = (EnGb*)thisx;
GlobalContext* globalCtx = globalCtx2;
s32 i;
f32 rand;
@ -421,7 +419,7 @@ void EnGb_Update(Actor* thisx, GlobalContext* globalCtx2) {
}
void EnGb_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnGb* this = THIS;
EnGb* this = (EnGb*)thisx;
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_gb.c", 763);