1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-23 07:21:19 +00:00

Remove THIS macro (#1047)

* 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

View file

@ -9,8 +9,6 @@
#define FLAGS 0x00000000
#define THIS ((ObjHsblock*)thisx)
void ObjHsblock_Init(Actor* thisx, GlobalContext* globalCtx);
void ObjHsblock_Destroy(Actor* thisx, GlobalContext* globalCtx);
void ObjHsblock_Update(Actor* thisx, GlobalContext* globalCtx);
@ -77,7 +75,7 @@ void func_80B93BF0(ObjHsblock* this, GlobalContext* globalCtx) {
}
void ObjHsblock_Init(Actor* thisx, GlobalContext* globalCtx) {
ObjHsblock* this = THIS;
ObjHsblock* this = (ObjHsblock*)thisx;
func_80B93B68(this, globalCtx, sCollisionHeaders[thisx->params & 3], DPM_UNK);
Actor_ProcessInitChain(thisx, sInitChain);
@ -102,7 +100,7 @@ void ObjHsblock_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void ObjHsblock_Destroy(Actor* thisx, GlobalContext* globalCtx) {
ObjHsblock* this = THIS;
ObjHsblock* this = (ObjHsblock*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
@ -138,7 +136,7 @@ void func_80B93E5C(ObjHsblock* this, GlobalContext* globalCtx) {
}
void ObjHsblock_Update(Actor* thisx, GlobalContext* globalCtx) {
ObjHsblock* this = THIS;
ObjHsblock* this = (ObjHsblock*)thisx;
if (this->actionFunc != NULL) {
this->actionFunc(this, globalCtx);