1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-17 20:42:23 +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 0x00000030
#define THIS ((EnNwc*)thisx)
void EnNwc_Init(Actor* thisx, GlobalContext* globalCtx);
void EnNwc_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnNwc_Update(Actor* thisx, GlobalContext* globalCtx);
@ -205,7 +203,7 @@ void EnNwc_DrawChicks(EnNwc* this, GlobalContext* globalCtx) {
void EnNwc_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
EnNwc* this = THIS;
EnNwc* this = (EnNwc*)thisx;
ColliderJntSphElementInit elementInits[16];
ColliderJntSphElementInit* element;
EnNwcChick* chick;
@ -232,7 +230,7 @@ void EnNwc_Init(Actor* thisx, GlobalContext* globalCtx) {
void EnNwc_Destroy(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
EnNwc* this = THIS;
EnNwc* this = (EnNwc*)thisx;
Collider_FreeJntSph(globalCtx, &this->collider);
}
@ -243,7 +241,7 @@ void EnNwc_Idle(EnNwc* this, GlobalContext* globalCtx) {
void EnNwc_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
EnNwc* this = THIS;
EnNwc* this = (EnNwc*)thisx;
this->updateFunc(this, globalCtx);
CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
@ -251,7 +249,7 @@ void EnNwc_Update(Actor* thisx, GlobalContext* globalCtx) {
void EnNwc_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
EnNwc* this = THIS;
EnNwc* this = (EnNwc*)thisx;
EnNwc_DrawChicks(this, globalCtx);
}