mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 06:52:03 +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

12
src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c
View file

@ -8,8 +8,6 @@
#define FLAGS 0x02000010
#define THIS ((MagicWind*)thisx)
void MagicWind_Init(Actor* thisx, GlobalContext* globalCtx);
void MagicWind_Destroy(Actor* thisx, GlobalContext* globalCtx);
void MagicWind_Update(Actor* thisx, GlobalContext* globalCtx);
@ -44,7 +42,7 @@ void MagicWind_SetupAction(MagicWind* this, MagicWindFunc actionFunc) {
}
void MagicWind_Init(Actor* thisx, GlobalContext* globalCtx) {
MagicWind* this = THIS;
MagicWind* this = (MagicWind*)thisx;
Player* player = GET_PLAYER(globalCtx);
if (SkelCurve_Init(globalCtx, &this->skelCurve, &sSkel, &sAnim) == 0) {
@ -69,7 +67,7 @@ void MagicWind_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void MagicWind_Destroy(Actor* thisx, GlobalContext* globalCtx) {
MagicWind* this = THIS;
MagicWind* this = (MagicWind*)thisx;
SkelCurve_Destroy(globalCtx, &this->skelCurve);
func_800876C8(globalCtx);
// "wipe out"
@ -132,7 +130,7 @@ void MagicWind_Shrink(MagicWind* this, GlobalContext* globalCtx) {
}
void MagicWind_Update(Actor* thisx, GlobalContext* globalCtx) {
MagicWind* this = THIS;
MagicWind* this = (MagicWind*)thisx;
if (globalCtx->msgCtx.msgMode == MSGMODE_OCARINA_CORRECT_PLAYBACK ||
globalCtx->msgCtx.msgMode == MSGMODE_SONG_PLAYED) {
Actor_Kill(thisx);
@ -143,7 +141,7 @@ void MagicWind_Update(Actor* thisx, GlobalContext* globalCtx) {
}
s32 MagicWind_OverrideLimbDraw(GlobalContext* globalCtx, SkelAnimeCurve* skelCurve, s32 limbIndex, void* thisx) {
MagicWind* this = THIS;
MagicWind* this = (MagicWind*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_magic_wind.c", 615);
@ -169,7 +167,7 @@ s32 MagicWind_OverrideLimbDraw(GlobalContext* globalCtx, SkelAnimeCurve* skelCur
void MagicWind_Draw(Actor* thisx, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
MagicWind* this = THIS;
MagicWind* this = (MagicWind*)thisx;
OPEN_DISPS(gfxCtx, "../z_magic_wind.c", 661);