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

34
src/overlays/actors/ovl_En_Ik/z_en_ik.c
View file

@ -11,8 +11,6 @@
#define FLAGS 0x00000010
#define THIS ((EnIk*)thisx)
typedef void (*EnIkDrawFunc)(struct EnIk*, GlobalContext*);
void EnIk_Init(Actor* thisx, GlobalContext* globalCtx);
@ -168,7 +166,7 @@ static DamageTable sDamageTable = {
};
void EnIk_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnIk* this = THIS;
EnIk* this = (EnIk*)thisx;
if (Actor_FindNearby(globalCtx, &this->actor, ACTOR_EN_IK, ACTORCAT_ENEMY, 8000.0f) == NULL) {
func_800F5B58();
@ -184,7 +182,7 @@ void EnIk_SetupAction(EnIk* this, EnIkActionFunc actionFunc) {
}
void func_80A74398(Actor* thisx, GlobalContext* globalCtx) {
EnIk* this = THIS;
EnIk* this = (EnIk*)thisx;
s32 pad;
EffectBlureInit1 blureInit;
@ -744,7 +742,7 @@ void func_80A75C38(EnIk* this, GlobalContext* globalCtx) {
}
void func_80A75FA0(Actor* thisx, GlobalContext* globalCtx) {
EnIk* this = THIS;
EnIk* this = (EnIk*)thisx;
s32 pad;
Player* player = GET_PLAYER(globalCtx);
u8 prevInvincibilityTimer;
@ -806,7 +804,7 @@ Gfx* func_80A761B0(GraphicsContext* gfxCtx, u8 primR, u8 primG, u8 primB, u8 env
}
s32 EnIk_OverrideLimbDraw3(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
EnIk* this = THIS;
EnIk* this = (EnIk*)thisx;
if (limbIndex == 12) {
if (this->actor.params != 0) {
@ -853,7 +851,7 @@ static Vec3f D_80A784D0[] = {
void EnIk_PostLimbDraw3(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
Vec3f spF4;
Vec3f spE8;
EnIk* this = THIS;
EnIk* this = (EnIk*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ik_inFight.c", 1201);
@ -929,7 +927,7 @@ void EnIk_PostLimbDraw3(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
}
void func_80A76798(Actor* thisx, GlobalContext* globalCtx) {
EnIk* this = THIS;
EnIk* this = (EnIk*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ik_inFight.c", 1309);
@ -1058,7 +1056,7 @@ void func_80A770C0(EnIk* this, GlobalContext* globalCtx, s32 actionIdx) {
}
f32 EnIk_curFrame(Actor* thisx) {
EnIk* this = THIS;
EnIk* this = (EnIk*)thisx;
return this->skelAnime.curFrame;
}
@ -1152,7 +1150,7 @@ void func_80A774F8(EnIk* this, GlobalContext* globalCtx) {
}
s32 EnIk_OverrideLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
EnIk* this = THIS;
EnIk* this = (EnIk*)thisx;
if ((limbIndex == 13) || (limbIndex == 26) || (limbIndex == 27)) {
if (EnIk_curFrame(&this->actor) >= 30.0f) {
@ -1170,7 +1168,7 @@ void EnIk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
switch (limbIndex) {
case 13: {
EnIk* this = THIS;
EnIk* this = (EnIk*)thisx;
if (EnIk_curFrame(&this->actor) < 30.0f) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_ik_inAwake.c", 267),
@ -1189,7 +1187,7 @@ void EnIk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016EE8);
break;
case 26: {
EnIk* this = THIS;
EnIk* this = (EnIk*)thisx;
if (EnIk_curFrame(&this->actor) < 30.0f) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_ik_inAwake.c", 288),
@ -1198,7 +1196,7 @@ void EnIk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
}
} break;
case 27: {
EnIk* this = THIS;
EnIk* this = (EnIk*)thisx;
if (EnIk_curFrame(&this->actor) < 30.0f) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_ik_inAwake.c", 297),
@ -1293,7 +1291,7 @@ static EnIkActionFunc sActionFuncs[] = {
};
void EnIk_Update(Actor* thisx, GlobalContext* globalCtx) {
EnIk* this = THIS;
EnIk* this = (EnIk*)thisx;
if (this->action < 0 || this->action >= ARRAY_COUNT(sActionFuncs) || sActionFuncs[this->action] == NULL) {
osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
@ -1304,7 +1302,7 @@ void EnIk_Update(Actor* thisx, GlobalContext* globalCtx) {
}
s32 EnIk_OverrideLimbDraw1(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
EnIk* this = THIS;
EnIk* this = (EnIk*)thisx;
f32 curFrame;
switch (limbIndex) {
@ -1386,7 +1384,7 @@ void func_80A77EDC(EnIk* this, GlobalContext* globalCtx) {
static EnIkDrawFunc sDrawFuncs[] = { func_80A77ED0, func_80A77EDC, func_80A77844 };
void EnIk_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnIk* this = THIS;
EnIk* this = (EnIk*)thisx;
if (this->drawMode < 0 || this->drawMode >= ARRAY_COUNT(sDrawFuncs) || sDrawFuncs[this->drawMode] == NULL) {
osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
@ -1420,7 +1418,7 @@ void func_80A78160(EnIk* this, GlobalContext* globalCtx) {
}
void func_80A781CC(Actor* thisx, GlobalContext* globalCtx) {
EnIk* this = THIS;
EnIk* this = (EnIk*)thisx;
if (!Gameplay_InCsMode(globalCtx)) {
this->actor.update = EnIk_Update;
@ -1434,7 +1432,7 @@ void func_80A781CC(Actor* thisx, GlobalContext* globalCtx) {
}
void EnIk_Init(Actor* thisx, GlobalContext* globalCtx) {
EnIk* this = THIS;
EnIk* this = (EnIk*)thisx;
s32 flag = this->actor.params & 0xFF00;
if (((this->actor.params & 0xFF) == 0 && (gSaveContext.eventChkInf[3] & 0x1000)) ||