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

@ -8,8 +8,6 @@
#define FLAGS 0x00000010
#define THIS ((ObjRoomtimer*)thisx)
void ObjRoomtimer_Init(Actor* thisx, GlobalContext* globalCtx);
void ObjRoomtimer_Destroy(Actor* thisx, GlobalContext* globalCtx);
void ObjRoomtimer_Update(Actor* thisx, GlobalContext* globalCtx);
@ -30,7 +28,7 @@ const ActorInit Obj_Roomtimer_InitVars = {
};
void ObjRoomtimer_Init(Actor* thisx, GlobalContext* globalCtx) {
ObjRoomtimer* this = THIS;
ObjRoomtimer* this = (ObjRoomtimer*)thisx;
s16 params = this->actor.params;
this->switchFlag = (params >> 10) & 0x3F;
@ -49,7 +47,7 @@ void ObjRoomtimer_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void ObjRoomtimer_Destroy(Actor* thisx, GlobalContext* globalCtx) {
ObjRoomtimer* this = THIS;
ObjRoomtimer* this = (ObjRoomtimer*)thisx;
if ((this->actor.params != 0x3FF) && (gSaveContext.timer1Value > 0)) {
gSaveContext.timer1State = 10;
@ -84,7 +82,7 @@ void func_80B9D0B0(ObjRoomtimer* this, GlobalContext* globalCtx) {
}
void ObjRoomtimer_Update(Actor* thisx, GlobalContext* globalCtx) {
ObjRoomtimer* this = THIS;
ObjRoomtimer* this = (ObjRoomtimer*)thisx;
this->actionFunc(this, globalCtx);
}