mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-23 23:41:24 +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_Cs/z_en_cs.c
View file

@ -4,8 +4,6 @@
#define FLAGS 0x00000009
#define THIS ((EnCs*)thisx)
void EnCs_Init(Actor* thisx, GlobalContext* globalCtx);
void EnCs_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnCs_Update(Actor* thisx, GlobalContext* globalCtx);
@ -116,7 +114,7 @@ void EnCs_SetAnimFromIndex(EnCs* this, s32 animIndex, s32* currentAnimIndex) {
}
void EnCs_Init(Actor* thisx, GlobalContext* globalCtx) {
EnCs* this = THIS;
EnCs* this = (EnCs*)thisx;
s32 pad;
if (!IS_DAY) {
@ -152,7 +150,7 @@ void EnCs_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void EnCs_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnCs* this = THIS;
EnCs* this = (EnCs*)thisx;
Collider_DestroyCylinder(globalCtx, &this->collider);
}
@ -412,7 +410,7 @@ void EnCs_Talk(EnCs* this, GlobalContext* globalCtx) {
void EnCs_Update(Actor* thisx, GlobalContext* globalCtx) {
static s32 eyeBlinkFrames[] = { 70, 1, 1 };
EnCs* this = THIS;
EnCs* this = (EnCs*)thisx;
s32 pad;
if (this->currentAnimIndex == 0) {
@ -453,7 +451,7 @@ void EnCs_Draw(Actor* thisx, GlobalContext* globalCtx) {
gGraveyardKidEyesHalfTex,
gGraveyardKidEyesClosedTex,
};
EnCs* this = THIS;
EnCs* this = (EnCs*)thisx;
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_cs.c", 968);
@ -484,7 +482,7 @@ void EnCs_Draw(Actor* thisx, GlobalContext* globalCtx) {
}
s32 EnCs_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
EnCs* this = THIS;
EnCs* this = (EnCs*)thisx;
if (this->flag & 1) {
switch (limbIndex) {
@ -504,7 +502,7 @@ s32 EnCs_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
void EnCs_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
static Vec3f D_809E2970 = { 500.0f, 800.0f, 0.0f };
EnCs* this = THIS;
EnCs* this = (EnCs*)thisx;
if (limbIndex == 15) {
Matrix_MultVec3f(&D_809E2970, &this->actor.focus.pos);