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

24
src/overlays/actors/ovl_En_Elf/z_en_elf.c
View file

@ -9,8 +9,6 @@
#define FLAGS 0x02000030
#define THIS ((EnElf*)thisx)
#define FAIRY_FLAG_TIMED (1 << 8)
#define FAIRY_FLAG_BIG (1 << 9)
@ -314,7 +312,7 @@ f32 EnElf_GetColorValue(s32 colorFlag) {
}
void EnElf_Init(Actor* thisx, GlobalContext* globalCtx) {
EnElf* this = THIS;
EnElf* this = (EnElf*)thisx;
s32 pad;
Player* player = GET_PLAYER(globalCtx);
s32 colorConfig;
@ -434,7 +432,7 @@ void func_80A029A8(EnElf* this, s16 increment) {
void EnElf_Destroy(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
EnElf* this = THIS;
EnElf* this = (EnElf*)thisx;
LightContext_RemoveLight(globalCtx, &globalCtx->lightCtx, this->lightNodeGlow);
LightContext_RemoveLight(globalCtx, &globalCtx->lightCtx, this->lightNodeNoGlow);
@ -1253,7 +1251,7 @@ void func_80A04F94(EnElf* this, GlobalContext* globalCtx) {
// ask to talk to saria again
void func_80A05040(Actor* thisx, GlobalContext* globalCtx) {
EnElf* this = THIS;
EnElf* this = (EnElf*)thisx;
func_80A04DE4(this, globalCtx);
@ -1276,7 +1274,7 @@ void func_80A05040(Actor* thisx, GlobalContext* globalCtx) {
}
void func_80A05114(Actor* thisx, GlobalContext* globalCtx) {
EnElf* this = THIS;
EnElf* this = (EnElf*)thisx;
func_80A04DE4(this, globalCtx);
@ -1289,7 +1287,7 @@ void func_80A05114(Actor* thisx, GlobalContext* globalCtx) {
}
void func_80A05188(Actor* thisx, GlobalContext* globalCtx) {
EnElf* this = THIS;
EnElf* this = (EnElf*)thisx;
func_80A04DE4(this, globalCtx);
@ -1304,7 +1302,7 @@ void func_80A05188(Actor* thisx, GlobalContext* globalCtx) {
// ask to talk to navi
void func_80A05208(Actor* thisx, GlobalContext* globalCtx) {
s32 naviCUpText;
EnElf* this = THIS;
EnElf* this = (EnElf*)thisx;
func_80A04DE4(this, globalCtx);
@ -1335,7 +1333,7 @@ void func_80A05208(Actor* thisx, GlobalContext* globalCtx) {
// ask to talk to saria
void func_80A052F4(Actor* thisx, GlobalContext* globalCtx) {
EnElf* this = THIS;
EnElf* this = (EnElf*)thisx;
func_80A04DE4(this, globalCtx);
@ -1367,7 +1365,7 @@ void func_80A053F0(Actor* thisx, GlobalContext* globalCtx) {
u8 unk2C7;
s32 pad;
Player* player = GET_PLAYER(globalCtx);
EnElf* this = THIS;
EnElf* this = (EnElf*)thisx;
if (player->naviTextId == 0) {
if (player->unk_664 == NULL) {
@ -1448,7 +1446,7 @@ void func_80A053F0(Actor* thisx, GlobalContext* globalCtx) {
void EnElf_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
EnElf* this = THIS;
EnElf* this = (EnElf*)thisx;
this->actionFunc(this, globalCtx);
this->actor.shape.rot.y = this->unk_2BC;
@ -1465,7 +1463,7 @@ s32 EnElf_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
s32 pad;
f32 scale;
Vec3f mtxMult;
EnElf* this = THIS;
EnElf* this = (EnElf*)thisx;
if (limbIndex == 8) {
scale = ((Math_SinS(this->timer * 4096) * 0.1f) + 1.0f) * 0.012f;
@ -1494,7 +1492,7 @@ void EnElf_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
f32 alphaScale;
s32 envAlpha;
EnElf* this = THIS;
EnElf* this = (EnElf*)thisx;
s32 pad1;
Gfx* dListHead;
Player* player = GET_PLAYER(globalCtx);