mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 15:01:17 +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_Tp/z_en_tp.c
View file

@ -9,8 +9,6 @@
#define FLAGS 0x00000000
#define THIS ((EnTp*)thisx)
void EnTp_Init(Actor* thisx, GlobalContext* globalCtx);
void EnTp_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnTp_Update(Actor* thisx, GlobalContext* globalCtx);
@ -132,7 +130,7 @@ void EnTp_SetupAction(EnTp* this, EnTpActionFunc actionFunc) {
void EnTp_Init(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
EnTp* this = THIS;
EnTp* this = (EnTp*)thisx;
EnTp* now;
EnTp* next;
s32 i;
@ -189,7 +187,7 @@ void EnTp_Init(Actor* thisx, GlobalContext* globalCtx2) {
}
void EnTp_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnTp* this = THIS;
EnTp* this = (EnTp*)thisx;
Collider_DestroyJntSph(globalCtx, &this->collider);
}
@ -647,7 +645,7 @@ void EnTp_UpdateDamage(EnTp* this, GlobalContext* globalCtx) {
void EnTp_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
EnTp* this = THIS;
EnTp* this = (EnTp*)thisx;
Vec3f kiraVelocity = { 0.0f, 0.0f, 0.0f };
Vec3f kiraAccel = { 0.0f, -0.6f, 0.0f };
Vec3f kiraPos;
@ -729,7 +727,7 @@ void EnTp_Update(Actor* thisx, GlobalContext* globalCtx) {
void EnTp_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
EnTp* this = THIS;
EnTp* this = (EnTp*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_tp.c", 1451);