mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 06:52:03 +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

12
src/overlays/actors/ovl_En_Fw/z_en_fw.c
View file

@ -11,8 +11,6 @@
#define FLAGS 0x00000215
#define THIS ((EnFw*)thisx)
void EnFw_Init(Actor* thisx, GlobalContext* globalCtx);
void EnFw_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnFw_Update(Actor* thisx, GlobalContext* globalCtx);
@ -184,7 +182,7 @@ s32 EnFw_SpawnDust(EnFw* this, u8 timer, f32 scale, f32 scaleStep, s32 dustCnt,
}
void EnFw_Init(Actor* thisx, GlobalContext* globalCtx) {
EnFw* this = THIS;
EnFw* this = (EnFw*)thisx;
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gFlareDancerCoreSkel, NULL, this->jointTable, this->morphTable,
11);
@ -200,7 +198,7 @@ void EnFw_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void EnFw_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnFw* this = THIS;
EnFw* this = (EnFw*)thisx;
Collider_DestroyJntSph(globalCtx, &this->collider);
}
@ -354,7 +352,7 @@ void EnFw_JumpToParentInitPos(EnFw* this, GlobalContext* globalCtx) {
}
void EnFw_Update(Actor* thisx, GlobalContext* globalCtx) {
EnFw* this = THIS;
EnFw* this = (EnFw*)thisx;
SkelAnime_Update(&this->skelAnime);
if ((this->actor.flags & 0x2000) != 0x2000) {
// not attached to hookshot.
@ -374,7 +372,7 @@ s32 EnFw_OverrideLimbDraw(GlobalContext* globalContext, s32 limbIndex, Gfx** dLi
}
void EnFw_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
EnFw* this = THIS;
EnFw* this = (EnFw*)thisx;
Vec3f zeroVec = { 0.0f, 0.0f, 0.0f };
if (limbIndex == 2) {
@ -391,7 +389,7 @@ void EnFw_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec
}
void EnFw_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnFw* this = THIS;
EnFw* this = (EnFw*)thisx;
EnFw_UpdateDust(this);
Matrix_Push();