mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-20 14:01: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

14
src/overlays/actors/ovl_En_GeldB/z_en_geldb.c
View file

@ -9,8 +9,6 @@
#define FLAGS 0x00000015
#define THIS ((EnGeldB*)thisx)
typedef enum {
/* 0 */ GELDB_WAIT,
/* 1 */ GELDB_DEFEAT,
@ -220,7 +218,7 @@ void EnGeldB_SetupAction(EnGeldB* this, EnGeldBActionFunc actionFunc) {
void EnGeldB_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
EffectBlureInit1 blureInit;
EnGeldB* this = THIS;
EnGeldB* this = (EnGeldB*)thisx;
Actor_ProcessInitChain(thisx, sInitChain);
thisx->colChkInfo.damageTable = &sDamageTable;
@ -262,7 +260,7 @@ void EnGeldB_Init(Actor* thisx, GlobalContext* globalCtx) {
void EnGeldB_Destroy(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
EnGeldB* this = THIS;
EnGeldB* this = (EnGeldB*)thisx;
func_800F5B58();
Effect_Delete(globalCtx, this->blureIndex);
@ -1395,7 +1393,7 @@ void EnGeldB_CollisionCheck(EnGeldB* this, GlobalContext* globalCtx) {
void EnGeldB_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
EnGeldB* this = THIS;
EnGeldB* this = (EnGeldB*)thisx;
EnGeldB_CollisionCheck(this, globalCtx);
if (this->actor.colChkInfo.damageEffect != GELDB_DMG_UNK_6) {
@ -1429,7 +1427,7 @@ void EnGeldB_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 EnGeldB_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
void* thisx) {
EnGeldB* this = THIS;
EnGeldB* this = (EnGeldB*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_geldB.c", 2507);
if (limbIndex == GELDB_LIMB_NECK) {
@ -1462,7 +1460,7 @@ void EnGeldB_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
static Vec3f zeroVec = { 0.0f, 0.0f, 0.0f };
Vec3f swordTip;
Vec3f swordHilt;
EnGeldB* this = THIS;
EnGeldB* this = (EnGeldB*)thisx;
s32 bodyPart = -1;
if (limbIndex == GELDB_LIMB_R_SWORD) {
@ -1550,7 +1548,7 @@ void EnGeldB_Draw(Actor* thisx, GlobalContext* globalCtx) {
static void* eyeTextures[] = { gGerudoRedEyeOpenTex, gGerudoRedEyeHalfTex, gGerudoRedEyeShutTex,
gGerudoRedEyeHalfTex };
s32 pad;
EnGeldB* this = THIS;
EnGeldB* this = (EnGeldB*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_geldB.c", 2672);
if (1) {}