mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 22:41:14 +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_En_Blkobj/z_en_blkobj.c
View file

@ -9,8 +9,6 @@
#define FLAGS 0x00000030
#define THIS ((EnBlkobj*)thisx)
void EnBlkobj_Init(Actor* thisx, GlobalContext* globalCtx);
void EnBlkobj_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnBlkobj_Update(Actor* thisx, GlobalContext* globalCtx);
@ -57,7 +55,7 @@ void EnBlkobj_SetupAction(EnBlkobj* this, EnBlkobjActionFunc actionFunc) {
void EnBlkobj_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
EnBlkobj* this = THIS;
EnBlkobj* this = (EnBlkobj*)thisx;
CollisionHeader* colHeader = NULL;
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
@ -74,7 +72,7 @@ void EnBlkobj_Init(Actor* thisx, GlobalContext* globalCtx) {
void EnBlkobj_Destroy(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
EnBlkobj* this = THIS;
EnBlkobj* this = (EnBlkobj*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -124,7 +122,7 @@ void EnBlkobj_DoNothing(EnBlkobj* this, GlobalContext* globalCtx) {
void EnBlkobj_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
EnBlkobj* this = THIS;
EnBlkobj* this = (EnBlkobj*)thisx;
this->actionFunc(this, globalCtx);
}
@ -149,7 +147,7 @@ void EnBlkobj_DrawAlpha(GlobalContext* globalCtx, Gfx* dList, s32 alpha) {
void EnBlkobj_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
EnBlkobj* this = THIS;
EnBlkobj* this = (EnBlkobj*)thisx;
s32 illusionAlpha;
u32 gameplayFrames;