mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 06:52:03 +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_Tsubo/z_obj_tsubo.c
View file

@ -11,8 +11,6 @@
#define FLAGS 0x00800010
#define THIS ((ObjTsubo*)thisx)
void ObjTsubo_Init(Actor* thisx, GlobalContext* globalCtx);
void ObjTsubo_Destroy(Actor* thisx, GlobalContext* globalCtx);
void ObjTsubo_Update(Actor* thisx, GlobalContext* globalCtx);
@ -121,7 +119,7 @@ s32 ObjTsubo_SnapToFloor(ObjTsubo* this, GlobalContext* globalCtx) {
}
void ObjTsubo_InitCollider(Actor* thisx, GlobalContext* globalCtx) {
ObjTsubo* this = THIS;
ObjTsubo* this = (ObjTsubo*)thisx;
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
@ -129,7 +127,7 @@ void ObjTsubo_InitCollider(Actor* thisx, GlobalContext* globalCtx) {
}
void ObjTsubo_Init(Actor* thisx, GlobalContext* globalCtx) {
ObjTsubo* this = THIS;
ObjTsubo* this = (ObjTsubo*)thisx;
Actor_ProcessInitChain(&this->actor, sInitChain);
ObjTsubo_InitCollider(&this->actor, globalCtx);
@ -150,7 +148,7 @@ void ObjTsubo_Init(Actor* thisx, GlobalContext* globalCtx) {
void ObjTsubo_Destroy(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
ObjTsubo* this = THIS;
ObjTsubo* this = (ObjTsubo*)thisx;
Collider_DestroyCylinder(globalCtx, &this->collider);
}
@ -330,7 +328,7 @@ void ObjTsubo_Thrown(ObjTsubo* this, GlobalContext* globalCtx) {
}
void ObjTsubo_Update(Actor* thisx, GlobalContext* globalCtx) {
ObjTsubo* this = THIS;
ObjTsubo* this = (ObjTsubo*)thisx;
this->actionFunc(this, globalCtx);
}