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

10
src/overlays/actors/ovl_En_Boom/z_en_boom.c
View file

@ -9,8 +9,6 @@
#define FLAGS 0x00000030
#define THIS ((EnBoom*)thisx)
void EnBoom_Init(Actor* thisx, GlobalContext* globalCtx);
void EnBoom_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnBoom_Update(Actor* thisx, GlobalContext* globalCtx);
@ -60,7 +58,7 @@ void EnBoom_SetupAction(EnBoom* this, EnBoomActionFunc actionFunc) {
}
void EnBoom_Init(Actor* thisx, GlobalContext* globalCtx) {
EnBoom* this = THIS;
EnBoom* this = (EnBoom*)thisx;
EffectBlureInit1 blure;
this->actor.room = -1;
@ -100,7 +98,7 @@ void EnBoom_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void EnBoom_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnBoom* this = THIS;
EnBoom* this = (EnBoom*)thisx;
Effect_Delete(globalCtx, this->effectIndex);
Collider_DestroyQuad(globalCtx, &this->collider);
@ -239,7 +237,7 @@ void EnBoom_Fly(EnBoom* this, GlobalContext* globalCtx) {
}
void EnBoom_Update(Actor* thisx, GlobalContext* globalCtx) {
EnBoom* this = THIS;
EnBoom* this = (EnBoom*)thisx;
Player* player = GET_PLAYER(globalCtx);
if (!(player->stateFlags1 & 0x20000000)) {
@ -252,7 +250,7 @@ void EnBoom_Update(Actor* thisx, GlobalContext* globalCtx) {
void EnBoom_Draw(Actor* thisx, GlobalContext* globalCtx) {
static Vec3f sMultVec1 = { -960.0f, 0.0f, 0.0f };
static Vec3f sMultVec2 = { 960.0f, 0.0f, 0.0f };
EnBoom* this = THIS;
EnBoom* this = (EnBoom*)thisx;
Vec3f vec1;
Vec3f vec2;