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 0x00000000
#define THIS ((EnBird*)thisx)
void EnBird_Init(Actor* thisx, GlobalContext* globalCtx);
void EnBird_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnBird_Update(Actor* thisx, GlobalContext* globalCtx);
@ -42,7 +40,7 @@ void EnBird_SetupAction(EnBird* this, EnBirdActionFunc actionFunc) {
}
void EnBird_Init(Actor* thisx, GlobalContext* globalCtx) {
EnBird* this = THIS;
EnBird* this = (EnBird*)thisx;
Actor_ProcessInitChain(&this->actor, sInitChain);
Actor_SetScale(&this->actor, 0.01);
@ -121,14 +119,14 @@ void func_809C1E40(EnBird* this, GlobalContext* globalCtx) {
}
void EnBird_Update(Actor* thisx, GlobalContext* globalCtx) {
EnBird* this = THIS;
EnBird* this = (EnBird*)thisx;
this->unk_1B4 += this->unk_1B8;
this->actionFunc(this, globalCtx);
}
void EnBird_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnBird* this = THIS;
EnBird* this = (EnBird*)thisx;
SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, NULL, NULL, NULL);
}