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

@ -9,8 +9,6 @@
#define FLAGS 0x00000019
#define THIS ((EnMk*)thisx)
void EnMk_Init(Actor* thisx, GlobalContext* globalCtx);
void EnMk_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnMk_Update(Actor* thisx, GlobalContext* globalCtx);
@ -51,7 +49,7 @@ static ColliderCylinderInit sCylinderInit = {
};
void EnMk_Init(Actor* thisx, GlobalContext* globalCtx) {
EnMk* this = THIS;
EnMk* this = (EnMk*)thisx;
s32 swimFlag;
this->actor.minVelocityY = -4.0f;
@ -76,7 +74,7 @@ void EnMk_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void EnMk_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnMk* this = THIS;
EnMk* this = (EnMk*)thisx;
Collider_DestroyCylinder(globalCtx, &this->collider);
}
@ -282,7 +280,7 @@ void EnMk_Wait(EnMk* this, GlobalContext* globalCtx) {
}
void EnMk_Update(Actor* thisx, GlobalContext* globalCtx) {
EnMk* this = THIS;
EnMk* this = (EnMk*)thisx;
s32 pad;
Vec3s vec;
Player* player;
@ -345,7 +343,7 @@ void EnMk_Update(Actor* thisx, GlobalContext* globalCtx) {
}
s32 EnMk_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
EnMk* this = THIS;
EnMk* this = (EnMk*)thisx;
if (limbIndex == 11) {
rot->y -= this->headRotation.y;
@ -357,7 +355,7 @@ s32 EnMk_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
void EnMk_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
static Vec3f D_80AAD64C = { 1000.0f, -100.0f, 0.0f };
EnMk* this = THIS;
EnMk* this = (EnMk*)thisx;
if (limbIndex == 11) {
Matrix_MultVec3f(&D_80AAD64C, &this->actor.focus.pos);
@ -365,7 +363,7 @@ void EnMk_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec
}
void EnMk_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnMk* this = THIS;
EnMk* this = (EnMk*)thisx;
func_800943C8(globalCtx->state.gfxCtx);
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,