mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 06:21: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

8
src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c
View file

@ -8,8 +8,6 @@
#define FLAGS 0x00000000
#define THIS ((ObjMure*)thisx)
void ObjMure_Init(Actor* thisx, GlobalContext* globalCtx);
void ObjMure_Destroy(Actor* thisx, GlobalContext* globalCtx);
void ObjMure_Update(Actor* thisx, GlobalContext* globalCtx);
@ -61,7 +59,7 @@ static InitChainEntry sInitChain[] = {
};
s32 ObjMure_SetCullingImpl(Actor* thisx, GlobalContext* globalCtx) {
ObjMure* this = THIS;
ObjMure* this = (ObjMure*)thisx;
s32 result;
switch (this->type) {
@ -88,7 +86,7 @@ s32 ObjMure_SetCulling(Actor* thisx, GlobalContext* globalCtx) {
}
void ObjMure_Init(Actor* thisx, GlobalContext* globalCtx) {
ObjMure* this = THIS;
ObjMure* this = (ObjMure*)thisx;
this->chNum = (thisx->params >> 0xC) & 0x0F;
this->ptn = (thisx->params >> 8) & 0x07;
@ -409,7 +407,7 @@ void ObjMure_ActiveState(ObjMure* this, GlobalContext* globalCtx) {
}
void ObjMure_Update(Actor* thisx, GlobalContext* globalCtx) {
ObjMure* this = THIS;
ObjMure* this = (ObjMure*)thisx;
if (this->unk_1A4 > 0) {
this->unk_1A4--;