mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-23 23:41:24 +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_Comb/z_obj_comb.c
View file

@ -10,8 +10,6 @@
#define FLAGS 0x00000000
#define THIS ((ObjComb*)thisx)
void ObjComb_Init(Actor* thisx, GlobalContext* globalCtx);
void ObjComb_Destroy(Actor* thisx, GlobalContext* globalCtx);
void ObjComb_Update(Actor* thisx, GlobalContext* globalCtx);
@ -149,7 +147,7 @@ void ObjComb_ChooseItemDrop(ObjComb* this, GlobalContext* globalCtx) {
}
void ObjComb_Init(Actor* thisx, GlobalContext* globalCtx) {
ObjComb* this = THIS;
ObjComb* this = (ObjComb*)thisx;
Actor_ProcessInitChain(&this->actor, sInitChain);
Collider_InitJntSph(globalCtx, &this->collider);
@ -159,7 +157,7 @@ void ObjComb_Init(Actor* thisx, GlobalContext* globalCtx) {
void ObjComb_Destroy(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
ObjComb* this = THIS;
ObjComb* this = (ObjComb*)thisx;
Collider_DestroyJntSph(globalCtx, &this->collider);
}
@ -196,7 +194,7 @@ void ObjComb_Wait(ObjComb* this, GlobalContext* globalCtx) {
}
void ObjComb_Update(Actor* thisx, GlobalContext* globalCtx) {
ObjComb* this = THIS;
ObjComb* this = (ObjComb*)thisx;
this->unk_1B2 += 0x2EE0;
this->actionFunc(this, globalCtx);
@ -204,7 +202,7 @@ void ObjComb_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void ObjComb_Draw(Actor* thisx, GlobalContext* globalCtx) {
ObjComb* this = THIS;
ObjComb* this = (ObjComb*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_obj_comb.c", 369);