1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 14:31:17 +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

@ -14,8 +14,6 @@
#define FLAGS 0x00000010
#define THIS ((EnNutsball*)thisx)
void EnNutsball_Init(Actor* thisx, GlobalContext* globalCtx);
void EnNutsball_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnNutsball_Update(Actor* thisx, GlobalContext* globalCtx);
@ -65,7 +63,7 @@ static Gfx* sDLists[] = {
};
void EnNutsball_Init(Actor* thisx, GlobalContext* globalCtx) {
EnNutsball* this = THIS;
EnNutsball* this = (EnNutsball*)thisx;
s32 pad;
ActorShape_Init(&this->actor.shape, 400.0f, ActorShadow_DrawCircle, 13.0f);
@ -81,7 +79,7 @@ void EnNutsball_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void EnNutsball_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnNutsball* this = THIS;
EnNutsball* this = (EnNutsball*)thisx;
Collider_DestroyCylinder(globalCtx, &this->collider);
}
@ -144,7 +142,7 @@ void func_80ABBBA8(EnNutsball* this, GlobalContext* globalCtx) {
}
void EnNutsball_Update(Actor* thisx, GlobalContext* globalCtx) {
EnNutsball* this = THIS;
EnNutsball* this = (EnNutsball*)thisx;
Player* player = GET_PLAYER(globalCtx);
s32 pad;