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

@ -3,8 +3,6 @@
#define FLAGS 0x00000030
#define THIS ((EfcErupc*)thisx)
void EfcErupc_Init(Actor* thisx, GlobalContext* globalCtx);
void EfcErupc_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EfcErupc_Update(Actor* thisx, GlobalContext* globalCtx);
@ -33,7 +31,7 @@ void EfcErupc_SetupAction(EfcErupc* this, EfcErupcActionFunc actionFunc) {
}
void EfcErupc_Init(Actor* thisx, GlobalContext* globalCtx) {
EfcErupc* this = THIS;
EfcErupc* this = (EfcErupc*)thisx;
EfcErupc_SetupAction(this, EfcErupc_UpdateAction);
Actor_SetScale(&this->actor, 1.0f);
@ -106,14 +104,14 @@ void EfcErupc_UpdateAction(EfcErupc* this, GlobalContext* globalCtx) {
}
void EfcErupc_Update(Actor* thisx, GlobalContext* globalCtx) {
EfcErupc* this = THIS;
EfcErupc* this = (EfcErupc*)thisx;
this->actionFunc(this, globalCtx);
EfcErupc_UpdateParticles(this, globalCtx);
}
void EfcErupc_Draw(Actor* thisx, GlobalContext* globalCtx) {
EfcErupc* this = THIS;
EfcErupc* this = (EfcErupc*)thisx;
u16 csAction;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_efc_erupc.c", 282);