mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-23 15:31:15 +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

16
src/overlays/actors/ovl_En_Go2/z_en_go2.c
View file

@ -5,8 +5,6 @@
#define FLAGS 0x00000039
#define THIS ((EnGo2*)thisx)
/*
FLAGS
@ -712,7 +710,7 @@ s16 EnGo2_GetStateGoronDmtFairyHint(GlobalContext* globalCtx, EnGo2* this) {
}
u16 EnGo2_GetTextId(GlobalContext* globalCtx, Actor* thisx) {
EnGo2* this = THIS;
EnGo2* this = (EnGo2*)thisx;
u16 faceReaction = Text_GetFaceReaction(globalCtx, 0x20);
if (faceReaction) {
@ -752,7 +750,7 @@ u16 EnGo2_GetTextId(GlobalContext* globalCtx, Actor* thisx) {
}
s16 EnGo2_GetState(GlobalContext* globalCtx, Actor* thisx) {
EnGo2* this = THIS;
EnGo2* this = (EnGo2*)thisx;
switch (this->actor.params & 0x1F) {
case GORON_CITY_ROLLING_BIG:
return EnGo2_GetStateGoronCityRollingBig(globalCtx, this);
@ -1474,7 +1472,7 @@ void EnGo2_BiggoronAnimation(EnGo2* this) {
}
void EnGo2_Init(Actor* thisx, GlobalContext* globalCtx) {
EnGo2* this = THIS;
EnGo2* this = (EnGo2*)thisx;
s32 pad;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 28.0f);
@ -1930,7 +1928,7 @@ void EnGo2_GoronFireGenericAction(EnGo2* this, GlobalContext* globalCtx) {
}
void EnGo2_Update(Actor* thisx, GlobalContext* globalCtx) {
EnGo2* this = THIS;
EnGo2* this = (EnGo2*)thisx;
func_80A45360(this, &this->alpha);
EnGo2_SitDownAnimation(this);
@ -1982,7 +1980,7 @@ s32 EnGo2_DrawRolling(EnGo2* this, GlobalContext* globalCtx) {
}
s32 EnGo2_OverrideLimbDraw(GlobalContext* globalCtx, s32 limb, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
EnGo2* this = THIS;
EnGo2* this = (EnGo2*)thisx;
Vec3s vec1;
f32 float1;
@ -2012,7 +2010,7 @@ s32 EnGo2_OverrideLimbDraw(GlobalContext* globalCtx, s32 limb, Gfx** dList, Vec3
}
void EnGo2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
EnGo2* this = THIS;
EnGo2* this = (EnGo2*)thisx;
Vec3f D_80A4856C = { 600.0f, 0.0f, 0.0f };
if (limbIndex == 17) {
@ -2021,7 +2019,7 @@ void EnGo2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
}
void EnGo2_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnGo2* this = THIS;
EnGo2* this = (EnGo2*)thisx;
void* eyeTextures[] = { gGoronCsEyeClosed2Tex, gGoronCsEyeOpenTex, gGoronCsEyeHalfTex, gGoronCsEyeClosedTex };
void* mouthTextures[] = { gGoronCsMouthNeutralTex, gGoronCsMouthSmileTex };