mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-24 16:01:26 +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_Ma2/z_en_ma2.c
View file

@ -3,8 +3,6 @@
#define FLAGS 0x02000039
#define THIS ((EnMa2*)thisx)
void EnMa2_Init(Actor* thisx, GlobalContext* globalCtx);
void EnMa2_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnMa2_Update(Actor* thisx, GlobalContext* globalCtx);
@ -204,7 +202,7 @@ void func_80AA1DB4(EnMa2* this, GlobalContext* globalCtx) {
}
void EnMa2_Init(Actor* thisx, GlobalContext* globalCtx) {
EnMa2* this = THIS;
EnMa2* this = (EnMa2*)thisx;
s32 pad;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 18.0f);
@ -242,7 +240,7 @@ void EnMa2_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void EnMa2_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnMa2* this = THIS;
EnMa2* this = (EnMa2*)thisx;
SkelAnime_Free(&this->skelAnime, globalCtx);
Collider_DestroyCylinder(globalCtx, &this->collider);
@ -302,7 +300,7 @@ void func_80AA21C8(EnMa2* this, GlobalContext* globalCtx) {
}
void EnMa2_Update(Actor* thisx, GlobalContext* globalCtx) {
EnMa2* this = THIS;
EnMa2* this = (EnMa2*)thisx;
s32 pad;
Collider_UpdateCylinder(&this->actor, &this->collider);
@ -319,7 +317,7 @@ void EnMa2_Update(Actor* thisx, GlobalContext* globalCtx) {
}
s32 EnMa2_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
EnMa2* this = THIS;
EnMa2* this = (EnMa2*)thisx;
Vec3s vec;
if ((limbIndex == MALON_ADULT_LEFT_THIGH_LIMB) || (limbIndex == MALON_ADULT_RIGHT_THIGH_LIMB)) {
@ -346,7 +344,7 @@ s32 EnMa2_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
}
void EnMa2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
EnMa2* this = THIS;
EnMa2* this = (EnMa2*)thisx;
Vec3f vec = { 900.0f, 0.0f, 0.0f };
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ma2.c", 904);
@ -365,7 +363,7 @@ void EnMa2_Draw(Actor* thisx, GlobalContext* globalCtx) {
static void* sMouthTextures[] = { gMalonAdultMouthNeutralTex, gMalonAdultMouthSadTex, gMalonAdultMouthHappyTex };
static void* sEyeTextures[] = { gMalonAdultEyeOpenTex, gMalonAdultEyeHalfTex, gMalonAdultEyeClosedTex };
EnMa2* this = THIS;
EnMa2* this = (EnMa2*)thisx;
Camera* camera;
f32 someFloat;
s32 pad;