mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-23 07:21:19 +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_Warp2block/z_obj_warp2block.c
View file

@ -10,8 +10,6 @@
#define FLAGS 0x0A000011
#define THIS ((ObjWarp2block*)thisx)
void ObjWarp2block_Init(Actor* thisx, GlobalContext* globalCtx);
void ObjWarp2block_Destroy(Actor* thisx, GlobalContext* globalCtx);
void ObjWarp2block_Update(Actor* thisx, GlobalContext* globalCtx);
@ -199,7 +197,7 @@ s32 func_80BA2304(ObjWarp2block* this, GlobalContext* globalCtx) {
void ObjWarp2block_Init(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
ObjWarp2block* this = THIS;
ObjWarp2block* this = (ObjWarp2block*)thisx;
CollisionHeader* collisionHeader;
collisionHeader = NULL;
@ -227,7 +225,7 @@ void ObjWarp2block_Init(Actor* thisx, GlobalContext* globalCtx2) {
}
void ObjWarp2block_Destroy(Actor* thisx, GlobalContext* globalCtx) {
ObjWarp2block* this = THIS;
ObjWarp2block* this = (ObjWarp2block*)thisx;
if ((this->dyna.actor.params >> 0xF) & 1) {
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -296,7 +294,7 @@ void func_80BA2610(ObjWarp2block* this, GlobalContext* globalCtx) {
}
void ObjWarp2block_Update(Actor* thisx, GlobalContext* globalCtx) {
ObjWarp2block* this = THIS;
ObjWarp2block* this = (ObjWarp2block*)thisx;
this->actionFunc(this, globalCtx);
if (this->unk_16C > 0) {