1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 06:52:03 +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 0x00000010
#define THIS ((EnStream*)thisx)
void EnStream_Init(Actor* thisx, GlobalContext* globalCtx);
void EnStream_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnStream_Update(Actor* thisx, GlobalContext* globalCtx);
@ -38,7 +36,7 @@ void EnStream_SetupAction(EnStream* this, EnStreamActionFunc actionFunc) {
}
void EnStream_Init(Actor* thisx, GlobalContext* globalCtx) {
EnStream* this = THIS;
EnStream* this = (EnStream*)thisx;
this->unk_150 = thisx->params & 0xFF;
Actor_ProcessInitChain(thisx, sInitChain);
@ -123,7 +121,7 @@ void EnStream_WaitForPlayer(EnStream* this, GlobalContext* globalCtx) {
}
void EnStream_Update(Actor* thisx, GlobalContext* globalCtx) {
EnStream* this = THIS;
EnStream* this = (EnStream*)thisx;
this->actionFunc(this, globalCtx);
func_8002F948(thisx, NA_SE_EV_WHIRLPOOL - SFX_FLAG);