1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 23:11:20 +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

@ -10,8 +10,6 @@
#define FLAGS 0x00000009
#define THIS ((EnDns*)thisx)
void EnDns_Init(Actor* thisx, GlobalContext* globalCtx);
void EnDns_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnDns_Update(Actor* thisx, GlobalContext* globalCtx);
@ -135,7 +133,7 @@ static DnsAnimInfo sAnimInfo[] = {
};
void EnDns_Init(Actor* thisx, GlobalContext* globalCtx) {
EnDns* this = THIS;
EnDns* this = (EnDns*)thisx;
if (this->actor.params < 0) {
// "Function Error (Deku Salesman)"
@ -170,7 +168,7 @@ void EnDns_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void EnDns_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnDns* this = THIS;
EnDns* this = (EnDns*)thisx;
Collider_DestroyCylinder(globalCtx, &this->collider);
}
@ -474,7 +472,7 @@ void EnDns_Burrow(EnDns* this, GlobalContext* globalCtx) {
}
void EnDns_Update(Actor* thisx, GlobalContext* globalCtx) {
EnDns* this = THIS;
EnDns* this = (EnDns*)thisx;
s16 pad;
this->dustTimer++;
@ -494,7 +492,7 @@ void EnDns_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void EnDns_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnDns* this = THIS;
EnDns* this = (EnDns*)thisx;
func_80093D18(globalCtx->state.gfxCtx);
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,