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

10
src/overlays/actors/ovl_En_Dog/z_en_dog.c
View file

@ -9,8 +9,6 @@
#define FLAGS 0x00000000
#define THIS ((EnDog*)thisx)
void EnDog_Init(Actor* thisx, GlobalContext* globalCtx);
void EnDog_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnDog_Update(Actor* thisx, GlobalContext* globalCtx);
@ -232,7 +230,7 @@ s32 EnDog_Orient(EnDog* this, GlobalContext* globalCtx) {
}
void EnDog_Init(Actor* thisx, GlobalContext* globalCtx) {
EnDog* this = THIS;
EnDog* this = (EnDog*)thisx;
s16 followingDog;
s32 pad;
@ -290,7 +288,7 @@ void EnDog_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void EnDog_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnDog* this = THIS;
EnDog* this = (EnDog*)thisx;
Collider_DestroyCylinder(globalCtx, &this->collider);
}
@ -441,7 +439,7 @@ void EnDog_Wait(EnDog* this, GlobalContext* globalCtx) {
}
void EnDog_Update(Actor* thisx, GlobalContext* globalCtx) {
EnDog* this = THIS;
EnDog* this = (EnDog*)thisx;
s32 pad;
EnDog_PlayAnimAndSFX(this);
@ -462,7 +460,7 @@ void EnDog_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
}
void EnDog_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnDog* this = THIS;
EnDog* this = (EnDog*)thisx;
Color_RGBA8 colors[] = { { 255, 255, 200, 0 }, { 150, 100, 50, 0 } };
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_dog.c", 972);