mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-23 07:21:19 +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_Ani/z_en_ani.c
View file

@ -9,8 +9,6 @@
#define FLAGS 0x00000009
#define THIS ((EnAni*)thisx)
void EnAni_Init(Actor* thisx, GlobalContext* globalCtx);
void EnAni_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnAni_Update(Actor* thisx, GlobalContext* globalCtx);
@ -71,7 +69,7 @@ static InitChainEntry sInitChain[] = {
void EnAni_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
EnAni* this = THIS;
EnAni* this = (EnAni*)thisx;
Actor_ProcessInitChain(&this->actor, sInitChain);
ActorShape_Init(&this->actor.shape, -2800.0f, ActorShadow_DrawCircle, 36.0f);
@ -93,7 +91,7 @@ void EnAni_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void EnAni_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnAni* this = THIS;
EnAni* this = (EnAni*)thisx;
Collider_DestroyCylinder(globalCtx, &this->collider);
}
@ -235,7 +233,7 @@ void func_809B0A6C(EnAni* this, GlobalContext* globalCtx) {
}
void EnAni_Update(Actor* thisx, GlobalContext* globalCtx) {
EnAni* this = THIS;
EnAni* this = (EnAni*)thisx;
s32 pad[2];
Collider_UpdateCylinder(&this->actor, &this->collider);
@ -293,7 +291,7 @@ void EnAni_Update(Actor* thisx, GlobalContext* globalCtx) {
}
s32 EnAni_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
EnAni* this = THIS;
EnAni* this = (EnAni*)thisx;
if (limbIndex == 15) {
rot->x += this->unk_29C.y;
@ -304,7 +302,7 @@ s32 EnAni_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
void EnAni_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
static Vec3f sMultVec = { 800.0f, 500.0f, 0.0f };
EnAni* this = THIS;
EnAni* this = (EnAni*)thisx;
if (limbIndex == 15) {
Matrix_MultVec3f(&sMultVec, &this->actor.focus.pos);
@ -317,7 +315,7 @@ void EnAni_Draw(Actor* thisx, GlobalContext* globalCtx) {
gRoofManEyeHalfTex,
gRoofManEyeClosedTex,
};
EnAni* this = THIS;
EnAni* this = (EnAni*)thisx;
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ani.c", 719);