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_Obj_Switch/z_obj_switch.c
View file

@ -10,8 +10,6 @@
#define FLAGS 0x00000010
#define THIS ((ObjSwitch*)thisx)
// type: (this->dyna.actor.params & 7)
// subtype: (this->dyna.actor.params >> 4 & 7)
// switch flag: (this->dyna.actor.params >> 8 & 0x3F)
@ -280,7 +278,7 @@ void ObjSwitch_UpdateTwoTexScrollXY(ObjSwitch* this) {
}
void ObjSwitch_Init(Actor* thisx, GlobalContext* globalCtx) {
ObjSwitch* this = THIS;
ObjSwitch* this = (ObjSwitch*)thisx;
s32 switchFlagSet;
s32 type;
@ -347,7 +345,7 @@ void ObjSwitch_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void ObjSwitch_Destroy(Actor* thisx, GlobalContext* globalCtx) {
ObjSwitch* this = THIS;
ObjSwitch* this = (ObjSwitch*)thisx;
switch ((this->dyna.actor.params & 7)) {
case OBJSWITCH_TYPE_FLOOR:
@ -676,7 +674,7 @@ void ObjSwitch_CrystalTurnOff(ObjSwitch* this, GlobalContext* globalCtx) {
}
void ObjSwitch_Update(Actor* thisx, GlobalContext* globalCtx) {
ObjSwitch* this = THIS;
ObjSwitch* this = (ObjSwitch*)thisx;
if (this->releaseTimer > 0) {
this->releaseTimer--;
@ -789,7 +787,7 @@ static ObjSwitchActionFunc sDrawFuncs[] = {
};
void ObjSwitch_Draw(Actor* thisx, GlobalContext* globalCtx) {
ObjSwitch* this = THIS;
ObjSwitch* this = (ObjSwitch*)thisx;
sDrawFuncs[(this->dyna.actor.params & 7)](this, globalCtx);
}