mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-20 22:11:16 +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_En_Light/z_en_light.c
View file

@ -10,8 +10,6 @@
#define FLAGS 0x00000000
#define THIS ((EnLight*)thisx)
void EnLight_Init(Actor* thisx, GlobalContext* globalCtx);
void EnLight_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnLight_Update(Actor* thisx, GlobalContext* globalCtx);
@ -48,7 +46,7 @@ static FlameParams D_80A9E840[] = {
};
void EnLight_Init(Actor* thisx, GlobalContext* globalCtx) {
EnLight* this = THIS;
EnLight* this = (EnLight*)thisx;
s16 yOffset;
if (gSaveContext.gameMode == 3) {
@ -72,7 +70,7 @@ void EnLight_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void EnLight_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnLight* this = THIS;
EnLight* this = (EnLight*)thisx;
LightContext_RemoveLight(globalCtx, &globalCtx->lightCtx, this->lightNode);
}
@ -93,7 +91,7 @@ void EnLight_Update(Actor* thisx, GlobalContext* globalCtx) {
f32 intensity;
FlameParams* flameParams;
s16 radius;
EnLight* this = THIS;
EnLight* this = (EnLight*)thisx;
flameParams = &D_80A9E840[this->actor.params & 0xF];
intensity = (Rand_ZeroOne() * 0.5f) + 0.5f;
@ -111,7 +109,7 @@ void EnLight_Update(Actor* thisx, GlobalContext* globalCtx) {
void EnLight_UpdateSwitch(Actor* thisx, GlobalContext* globalCtx) {
f32 intensity;
FlameParams* flameParams;
EnLight* this = THIS;
EnLight* this = (EnLight*)thisx;
f32 scale;
flameParams = &D_80A9E840[this->actor.params & 0xF];
@ -152,7 +150,7 @@ void EnLight_UpdateSwitch(Actor* thisx, GlobalContext* globalCtx) {
}
void EnLight_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnLight* this = THIS;
EnLight* this = (EnLight*)thisx;
s32 pad;
FlameParams* flameParams;
Gfx* dList;