mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 14:31:17 +00:00
Code Issues Projects Releases Wiki Activity

Remove THIS macro (#1047)

Browse source 
* 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
Download patch file Download diff file Expand all files Collapse all files

14
src/overlays/actors/ovl_En_Go/z_en_go.c
View file

@ -5,8 +5,6 @@
#define FLAGS 0x00000039
#define THIS ((EnGo*)thisx)
void EnGo_Init(Actor* thisx, GlobalContext* globalCtx);
void EnGo_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnGo_Update(Actor* thisx, GlobalContext* globalCtx);
@ -620,7 +618,7 @@ void func_80A3F908(EnGo* this, GlobalContext* globalCtx) {
}
void EnGo_Init(Actor* thisx, GlobalContext* globalCtx) {
EnGo* this = THIS;
EnGo* this = (EnGo*)thisx;
s32 pad;
Vec3f D_80A41B9C = { 0.0f, 0.0f, 0.0f }; // unused
Vec3f D_80A41BA8 = { 0.0f, 0.0f, 0.0f }; // unused
@ -693,7 +691,7 @@ void EnGo_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void EnGo_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnGo* this = THIS;
EnGo* this = (EnGo*)thisx;
SkelAnime_Free(&this->skelAnime, globalCtx);
Collider_DestroyCylinder(globalCtx, &this->collider);
@ -1018,7 +1016,7 @@ void func_80A40DCC(EnGo* this, GlobalContext* globalCtx) {
void EnGo_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
EnGo* this = THIS;
EnGo* this = (EnGo*)thisx;
Collider_UpdateCylinder(&this->actor, &this->collider);
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
@ -1080,7 +1078,7 @@ void EnGo_DrawRolling(EnGo* this, GlobalContext* globalCtx) {
}
s32 EnGo_OverrideLimbDraw(GlobalContext* globalCtx, s32 limb, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
EnGo* this = THIS;
EnGo* this = (EnGo*)thisx;
Vec3s vec1;
f32 float1;
@ -1113,7 +1111,7 @@ s32 EnGo_OverrideLimbDraw(GlobalContext* globalCtx, s32 limb, Gfx** dList, Vec3f
}
void EnGo_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
EnGo* this = THIS;
EnGo* this = (EnGo*)thisx;
Vec3f D_80A41BCC = { 600.0f, 0.0f, 0.0f };
if (limbIndex == 17) {
@ -1122,7 +1120,7 @@ void EnGo_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec
}
void EnGo_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnGo* this = THIS;
EnGo* this = (EnGo*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_go.c", 2479);