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

8
src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c
View file

@ -11,8 +11,6 @@
#define FLAGS 0x00000009
#define THIS ((ShotSun*)thisx)
void ShotSun_Init(Actor* thisx, GlobalContext* globalCtx);
void ShotSun_Destroy(Actor* thisx, GlobalContext* globalCtx);
void ShotSun_Update(Actor* thisx, GlobalContext* globalCtx);
@ -55,7 +53,7 @@ static ColliderCylinderInit sCylinderInit = {
};
void ShotSun_Init(Actor* thisx, GlobalContext* globalCtx) {
ShotSun* this = THIS;
ShotSun* this = (ShotSun*)thisx;
s32 params;
// "Ocarina secret occurrence"
@ -76,7 +74,7 @@ void ShotSun_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void ShotSun_Destroy(Actor* thisx, GlobalContext* globalCtx) {
ShotSun* this = THIS;
ShotSun* this = (ShotSun*)thisx;
s32 params = this->actor.params & 0xFF;
if (params != 0x40 && params != 0x41) {
@ -195,7 +193,7 @@ void ShotSun_UpdateHyliaSun(ShotSun* this, GlobalContext* globalCtx) {
}
void ShotSun_Update(Actor* thisx, GlobalContext* globalCtx) {
ShotSun* this = THIS;
ShotSun* this = (ShotSun*)thisx;
this->actionFunc(this, globalCtx);
}