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

10
src/overlays/actors/ovl_En_Ba/z_en_ba.c
View file

@ -9,8 +9,6 @@
#define FLAGS 0x00000015
#define THIS ((EnBa*)thisx)
void EnBa_Init(Actor* thisx, GlobalContext* globalCtx);
void EnBa_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnBa_Update(Actor* thisx, GlobalContext* globalCtx);
@ -91,7 +89,7 @@ static InitChainEntry sInitChain[] = {
};
void EnBa_Init(Actor* thisx, GlobalContext* globalCtx) {
EnBa* this = THIS;
EnBa* this = (EnBa*)thisx;
Vec3f sp38 = D_809B80E4;
s32 pad;
s16 i;
@ -128,7 +126,7 @@ void EnBa_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void EnBa_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnBa* this = THIS;
EnBa* this = (EnBa*)thisx;
Collider_DestroyJntSph(globalCtx, &this->collider);
}
@ -447,7 +445,7 @@ void EnBa_Die(EnBa* this, GlobalContext* globalCtx) {
}
void EnBa_Update(Actor* thisx, GlobalContext* globalCtx) {
EnBa* this = THIS;
EnBa* this = (EnBa*)thisx;
if ((this->actor.params < EN_BA_DEAD_BLOB) && (this->collider.base.acFlags & 2)) {
this->collider.base.acFlags &= ~2;
@ -470,7 +468,7 @@ void EnBa_Update(Actor* thisx, GlobalContext* globalCtx) {
static Gfx* D_809B8118[] = { 0x060024F0, 0x060027F0, 0x060029F0 };
void EnBa_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnBa* this = THIS;
EnBa* this = (EnBa*)thisx;
s32 pad;
s16 i;
Mtx* mtx = Graph_Alloc(globalCtx->state.gfxCtx, sizeof(Mtx) * 14);