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

12
src/overlays/actors/ovl_En_Bx/z_en_bx.c
View file

@ -9,8 +9,6 @@
#define FLAGS 0x00000010
#define THIS ((EnBx*)thisx)
void EnBx_Init(Actor* thisx, GlobalContext* globalCtx);
void EnBx_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnBx_Update(Actor* thisx, GlobalContext* globalCtx);
@ -69,7 +67,7 @@ static ColliderQuadInit sQuadInit = {
};
void EnBx_Init(Actor* thisx, GlobalContext* globalCtx) {
EnBx* this = THIS;
EnBx* this = (EnBx*)thisx;
Vec3f sp48 = { 0.015f, 0.015f, 0.015f };
Vec3f sp3C = { 0.0f, 0.0f, 0.0f };
static InitChainEntry sInitChain[] = {
@ -107,7 +105,7 @@ void EnBx_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void EnBx_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnBx* this = THIS;
EnBx* this = (EnBx*)thisx;
Collider_DestroyCylinder(globalCtx, &this->collider);
}
@ -119,7 +117,7 @@ void func_809D1D0C(Actor* thisx, GlobalContext* globalCtx) {
static Vec3f D_809D254C = { -8000.0f, 10000.0f, 2500.0f };
Vec3f sp44;
Vec3f sp38;
EnBx* this = THIS;
EnBx* this = (EnBx*)thisx;
Matrix_MultVec3f(&D_809D2540, &sp44);
Matrix_MultVec3f(&D_809D254C, &sp38);
@ -130,7 +128,7 @@ void func_809D1D0C(Actor* thisx, GlobalContext* globalCtx) {
}
void EnBx_Update(Actor* thisx, GlobalContext* globalCtx) {
EnBx* this = THIS;
EnBx* this = (EnBx*)thisx;
Player* player = GET_PLAYER(globalCtx);
s32 i;
s16 tmp32;
@ -198,7 +196,7 @@ void EnBx_Update(Actor* thisx, GlobalContext* globalCtx) {
void EnBx_Draw(Actor* thisx, GlobalContext* globalCtx) {
static void* D_809D2560[] = { 0x060024F0, 0x060027F0, 0x060029F0 };
EnBx* this = THIS;
EnBx* this = (EnBx*)thisx;
s32 pad;
Mtx* mtx = Graph_Alloc(globalCtx->state.gfxCtx, 4 * sizeof(Mtx));
s16 i;