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

10
src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c
View file

@ -8,8 +8,6 @@
#define FLAGS 0x02000010
#define THIS ((MagicFire*)thisx)
void MagicFire_Init(Actor* thisx, GlobalContext* globalCtx);
void MagicFire_Destroy(Actor* thisx, GlobalContext* globalCtx);
void MagicFire_Update(Actor* thisx, GlobalContext* globalCtx);
@ -77,7 +75,7 @@ static u8 sVertexIndices[] = {
};
void MagicFire_Init(Actor* thisx, GlobalContext* globalCtx) {
MagicFire* this = THIS;
MagicFire* this = (MagicFire*)thisx;
Actor_ProcessInitChain(&this->actor, sInitChain);
this->action = 0;
@ -98,7 +96,7 @@ void MagicFire_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
void MagicFire_UpdateBeforeCast(Actor* thisx, GlobalContext* globalCtx) {
MagicFire* this = THIS;
MagicFire* this = (MagicFire*)thisx;
Player* player = GET_PLAYER(globalCtx);
if ((globalCtx->msgCtx.msgMode == MSGMODE_OCARINA_CORRECT_PLAYBACK) ||
@ -116,7 +114,7 @@ void MagicFire_UpdateBeforeCast(Actor* thisx, GlobalContext* globalCtx) {
}
void MagicFire_Update(Actor* thisx, GlobalContext* globalCtx) {
MagicFire* this = THIS;
MagicFire* this = (MagicFire*)thisx;
Player* player = GET_PLAYER(globalCtx);
s32 pad;
@ -212,7 +210,7 @@ void MagicFire_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void MagicFire_Draw(Actor* thisx, GlobalContext* globalCtx) {
MagicFire* this = THIS;
MagicFire* this = (MagicFire*)thisx;
s32 pad1;
u32 gameplayFrames = globalCtx->gameplayFrames;
s32 pad2;