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

14
src/overlays/actors/ovl_En_Zl1/z_en_zl1.c
View file

@ -9,8 +9,6 @@
#define FLAGS 0x00000019
#define THIS ((EnZl1*)thisx)
void EnZl1_Init(Actor* thisx, GlobalContext* globalCtx);
void EnZl1_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnZl1_Update(Actor* thisx, GlobalContext* globalCtx);
@ -77,7 +75,7 @@ void func_80B4AB48(void) {
void EnZl1_Init(Actor* thisx, GlobalContext* globalCtx) {
f32 frameCount;
EnZl1* this = THIS;
EnZl1* this = (EnZl1*)thisx;
frameCount = Animation_GetLastFrame(&gChildZelda1Anim_12118);
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gChildZelda1Skel, NULL, NULL, NULL, 0);
@ -114,7 +112,7 @@ void EnZl1_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void EnZl1_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnZl1* this = THIS;
EnZl1* this = (EnZl1*)thisx;
SkelAnime_Free(&this->skelAnime, globalCtx);
Collider_DestroyCylinder(globalCtx, &this->collider);
@ -568,7 +566,7 @@ void func_80B4BF2C(EnZl1* this, GlobalContext* globalCtx) {
void EnZl1_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
EnZl1* this = THIS;
EnZl1* this = (EnZl1*)thisx;
if ((this->actionFunc != func_80B4B8B4) && (this->actionFunc != func_80B4BC78)) {
SkelAnime_Update(&this->skelAnime);
@ -586,7 +584,7 @@ void EnZl1_Update(Actor* thisx, GlobalContext* globalCtx) {
}
s32 EnZl1_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
EnZl1* this = THIS;
EnZl1* this = (EnZl1*)thisx;
if ((limbIndex == 4) || (limbIndex == 3) || (limbIndex == 6) || (limbIndex == 5)) {
*dList = NULL;
@ -608,7 +606,7 @@ s32 EnZl1_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
void EnZl1_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
Vec3f vec = { 0.0f, 0.0f, 0.0f };
EnZl1* this = THIS;
EnZl1* this = (EnZl1*)thisx;
if (limbIndex == 17) {
Matrix_MultVec3f(&vec, &this->actor.focus.pos);
@ -616,7 +614,7 @@ void EnZl1_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
}
void EnZl1_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnZl1* this = THIS;
EnZl1* this = (EnZl1*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_girlB.c", 2011);