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

10
src/overlays/actors/ovl_En_Fish/z_en_fish.c
View file

@ -10,8 +10,6 @@
#define FLAGS 0x00000000
#define THIS ((EnFish*)thisx)
void EnFish_Init(Actor* thisx, GlobalContext* globalCtx);
void EnFish_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnFish_Update(Actor* thisx, GlobalContext* globalCtx);
@ -130,7 +128,7 @@ void EnFish_ClearCutsceneData(EnFish* this) {
}
void EnFish_Init(Actor* thisx, GlobalContext* globalCtx) {
EnFish* this = THIS;
EnFish* this = (EnFish*)thisx;
s16 params = this->actor.params;
Actor_ProcessInitChain(&this->actor, sInitChain);
@ -155,7 +153,7 @@ void EnFish_Init(Actor* thisx, GlobalContext* globalCtx) {
void EnFish_Destroy(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
EnFish* this = THIS;
EnFish* this = (EnFish*)thisx;
Collider_DestroyJntSph(globalCtx, &this->collider);
}
@ -742,7 +740,7 @@ void EnFish_RespawningUpdate(EnFish* this, GlobalContext* globalCtx) {
}
void EnFish_Update(Actor* thisx, GlobalContext* globalCtx) {
EnFish* this = THIS;
EnFish* this = (EnFish*)thisx;
if ((D_80A17010 == NULL) && (this->actor.params == FISH_DROPPED) && (globalCtx->csCtx.state != 0) &&
(globalCtx->csCtx.npcActions[1] != NULL)) {
@ -760,7 +758,7 @@ void EnFish_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void EnFish_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnFish* this = THIS;
EnFish* this = (EnFish*)thisx;
func_80093D18(globalCtx->state.gfxCtx);
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,