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_Fu/z_en_fu.c
View file

@ -10,8 +10,6 @@
#define FLAGS 0x02000019
#define THIS ((EnFu*)thisx)
#define FU_RESET_LOOK_ANGLE (1 << 0)
#define FU_WAIT (1 << 1)
@ -75,7 +73,7 @@ typedef enum {
void EnFu_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
EnFu* this = THIS;
EnFu* this = (EnFu*)thisx;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f);
SkelAnime_InitFlex(globalCtx, &this->skelanime, &gWindmillManSkel, &gWindmillManPlayStillAnim, this->jointTable,
@ -98,7 +96,7 @@ void EnFu_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void EnFu_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnFu* this = THIS;
EnFu* this = (EnFu*)thisx;
Collider_DestroyCylinder(globalCtx, &this->collider);
}
@ -236,7 +234,7 @@ void EnFu_WaitAdult(EnFu* this, GlobalContext* globalCtx) {
void EnFu_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
EnFu* this = THIS;
EnFu* this = (EnFu*)thisx;
Collider_UpdateCylinder(&this->actor, &this->collider);
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
@ -259,7 +257,7 @@ void EnFu_Update(Actor* thisx, GlobalContext* globalCtx) {
}
s32 EnFu_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
EnFu* this = THIS;
EnFu* this = (EnFu*)thisx;
s32 pad;
if (limbIndex == FU_LIMB_UNK) {
@ -286,7 +284,7 @@ s32 EnFu_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
}
void EnFu_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
EnFu* this = THIS;
EnFu* this = (EnFu*)thisx;
if (limbIndex == FU_LIMB_HEAD) {
Matrix_MultVec3f(&sMtxSrc, &this->actor.focus.pos);
@ -297,7 +295,7 @@ void EnFu_Draw(Actor* thisx, GlobalContext* globalCtx) {
static void* sEyesSegments[] = { gWindmillManEyeClosedTex, gWindmillManEyeAngryTex };
static void* sMouthSegments[] = { gWindmillManMouthOpenTex, gWindmillManMouthAngryTex };
s32 pad;
EnFu* this = THIS;
EnFu* this = (EnFu*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_fu.c", 773);