mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-16 20:10:28 +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_Obj_Lightswitch/z_obj_lightswitch.c
View file

@ -11,8 +11,6 @@
#define FLAGS 0x00000010
#define THIS ((ObjLightswitch*)thisx)
typedef enum {
/* 0x00 */ FACE_EYES_CLOSED,
/* 0x01 */ FACE_EYES_OPEN,
@ -162,7 +160,7 @@ void ObjLightswitch_SpawnDisappearEffects(ObjLightswitch* this, GlobalContext* g
}
void ObjLightswitch_Init(Actor* thisx, GlobalContext* globalCtx) {
ObjLightswitch* this = THIS;
ObjLightswitch* this = (ObjLightswitch*)thisx;
s32 switchFlagSet = Flags_GetSwitch(globalCtx, this->actor.params >> 8 & 0x3F);
s32 removeSelf = false;
@ -209,7 +207,7 @@ void ObjLightswitch_Init(Actor* thisx, GlobalContext* globalCtx) {
void ObjLightswitch_Destroy(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
ObjLightswitch* this = THIS;
ObjLightswitch* this = (ObjLightswitch*)thisx;
Collider_DestroyJntSph(globalCtx, &this->collider);
}
@ -371,7 +369,7 @@ void ObjLightswitch_Disappear(ObjLightswitch* this, GlobalContext* globalCtx) {
}
void ObjLightswitch_Update(Actor* thisx, GlobalContext* globalCtx2) {
ObjLightswitch* this = THIS;
ObjLightswitch* this = (ObjLightswitch*)thisx;
GlobalContext* globalCtx = globalCtx2;
if (this->toggleDelay > 0) {
@ -487,7 +485,7 @@ void ObjLightswitch_DrawXlu(ObjLightswitch* this, GlobalContext* globalCtx) {
}
void ObjLightswitch_Draw(Actor* thisx, GlobalContext* globalCtx) {
ObjLightswitch* this = THIS;
ObjLightswitch* this = (ObjLightswitch*)thisx;
s32 alpha = this->alpha >> 6 & 0xFF;
if ((this->actor.params & 1) == 1) {