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_Boss_Fd2/z_boss_fd2.c
View file

@ -12,8 +12,6 @@
#define FLAGS 0x00000035
#define THIS ((BossFd2*)thisx)
typedef enum {
/* 0 */ DEATH_START,
/* 1 */ DEATH_RETREAT,
@ -172,7 +170,7 @@ void BossFd2_SpawnDust(BossFdEffect* effect, Vec3f* position, Vec3f* velocity, V
void BossFd2_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BossFd2* this = THIS;
BossFd2* this = (BossFd2*)thisx;
Actor_ProcessInitChain(&this->actor, sInitChain);
Actor_SetScale(&this->actor, 0.0069999993f);
@ -190,7 +188,7 @@ void BossFd2_Init(Actor* thisx, GlobalContext* globalCtx) {
void BossFd2_Destroy(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BossFd2* this = THIS;
BossFd2* this = (BossFd2*)thisx;
SkelAnime_Free(&this->skelAnime, globalCtx);
Collider_DestroyJntSph(globalCtx, &this->collider);
@ -954,7 +952,7 @@ void BossFd2_UpdateFace(BossFd2* this, GlobalContext* globalCtx) {
void BossFd2_Update(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
BossFd2* this = THIS;
BossFd2* this = (BossFd2*)thisx;
s16 i;
osSyncPrintf("FD2 move start \n");
@ -1002,7 +1000,7 @@ void BossFd2_Update(Actor* thisx, GlobalContext* globalCtx2) {
s32 BossFd2_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
void* thisx) {
BossFd2* this = THIS;
BossFd2* this = (BossFd2*)thisx;
BossFd* bossFd = (BossFd*)this->actor.parent;
if (limbIndex == 31) {
@ -1045,7 +1043,7 @@ void BossFd2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
static Vec3f centerManeMod = { 4000.0f, -2900.0, 2000.0f };
static Vec3f rightManeMod = { 4000.0f, -1600.0, 0.0f };
static Vec3f leftManeMod = { 4000.0f, -1600.0, -2000.0f };
BossFd2* this = THIS;
BossFd2* this = (BossFd2*)thisx;
if (limbIndex == 35) {
Matrix_MultVec3f(&targetMod, &this->actor.focus.pos);
@ -1191,7 +1189,7 @@ void BossFd2_DrawMane(BossFd2* this, GlobalContext* globalCtx) {
void BossFd2_Draw(Actor* thisx, GlobalContext* globalCtx) {
static void* eyeTextures[] = { gHoleVolvagiaEyeOpenTex, gHoleVolvagiaEyeHalfTex, gHoleVolvagiaEyeClosedTex };
s32 pad;
BossFd2* this = THIS;
BossFd2* this = (BossFd2*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_fd2.c", 2617);
osSyncPrintf("FD2 draw start \n");