mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-17 04:20:44 +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_Timeblock/z_obj_timeblock.c
View file

@ -9,8 +9,6 @@
#define FLAGS 0x0A000011
#define THIS ((ObjTimeblock*)thisx)
void ObjTimeblock_Init(Actor* thisx, GlobalContext* globalCtx);
void ObjTimeblock_Destroy(Actor* thisx, GlobalContext* globalCtx);
void ObjTimeblock_Update(Actor* thisx, GlobalContext* globalCtx);
@ -99,7 +97,7 @@ void ObjTimeblock_ToggleSwitchFlag(GlobalContext* globalCtx, s32 flag) {
}
void ObjTimeblock_Init(Actor* thisx, GlobalContext* globalCtx) {
ObjTimeblock* this = THIS;
ObjTimeblock* this = (ObjTimeblock*)thisx;
s32 pad;
CollisionHeader* colHeader = NULL;
@ -143,7 +141,7 @@ void ObjTimeblock_Init(Actor* thisx, GlobalContext* globalCtx) {
void ObjTimeblock_Destroy(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
ObjTimeblock* this = THIS;
ObjTimeblock* this = (ObjTimeblock*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -317,7 +315,7 @@ void ObjTimeblock_AltBehaviourNotVisible(ObjTimeblock* this, GlobalContext* glob
}
void ObjTimeblock_Update(Actor* thisx, GlobalContext* globalCtx) {
ObjTimeblock* this = THIS;
ObjTimeblock* this = (ObjTimeblock*)thisx;
this->actionFunc(this, globalCtx);