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

@ -11,8 +11,6 @@
#define FLAGS 0x00000010
#define THIS ((BgBreakwall*)thisx)
typedef struct {
/* 0x00 */ CollisionHeader* colHeader;
/* 0x04 */ Gfx* dList;
@ -79,7 +77,7 @@ void BgBreakwall_SetupAction(BgBreakwall* this, BgBreakwallActionFunc actionFunc
}
void BgBreakwall_Init(Actor* thisx, GlobalContext* globalCtx) {
BgBreakwall* this = THIS;
BgBreakwall* this = (BgBreakwall*)thisx;
s32 pad;
s32 wallType = ((this->dyna.actor.params >> 13) & 3) & 0xFF;
@ -116,7 +114,7 @@ void BgBreakwall_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void BgBreakwall_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgBreakwall* this = THIS;
BgBreakwall* this = (BgBreakwall*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -276,7 +274,7 @@ void BgBreakwall_LavaCoverMove(BgBreakwall* this, GlobalContext* globalCtx) {
}
void BgBreakwall_Update(Actor* thisx, GlobalContext* globalCtx) {
BgBreakwall* this = THIS;
BgBreakwall* this = (BgBreakwall*)thisx;
this->actionFunc(this, globalCtx);
}
@ -292,7 +290,7 @@ static Vec3f sColQuadList[][4] = {
void BgBreakwall_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgBreakwall* this = THIS;
BgBreakwall* this = (BgBreakwall*)thisx;
if (this->bombableWallDList != NULL) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_breakwall.c", 767);