mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-23 23:41:24 +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_Sb/z_en_sb.c
View file

@ -10,8 +10,6 @@
#define FLAGS 0x00000005
#define THIS ((EnSb*)thisx)
void EnSb_Init(Actor* thisx, GlobalContext* globalCtx);
void EnSb_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnSb_Update(Actor* thisx, GlobalContext* globalCtx);
@ -108,7 +106,7 @@ typedef enum {
} ShellbladeBehavior;
void EnSb_Init(Actor* thisx, GlobalContext* globalCtx) {
EnSb* this = THIS;
EnSb* this = (EnSb*)thisx;
Actor_ProcessInitChain(&this->actor, sInitChain);
this->actor.colChkInfo.damageTable = sDamageTable;
@ -129,7 +127,7 @@ void EnSb_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void EnSb_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnSb* this = THIS;
EnSb* this = (EnSb*)thisx;
SkelAnime_Free(&this->skelAnime, globalCtx);
Collider_DestroyCylinder(globalCtx, &this->collider);
}
@ -442,7 +440,7 @@ s32 EnSb_UpdateDamage(EnSb* this, GlobalContext* globalCtx) {
}
void EnSb_Update(Actor* thisx, GlobalContext* globalCtx) {
EnSb* this = THIS;
EnSb* this = (EnSb*)thisx;
s32 pad;
if (this->isDead) {
@ -475,13 +473,13 @@ void EnSb_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void EnSb_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
EnSb* this = THIS;
EnSb* this = (EnSb*)thisx;
BodyBreak_SetInfo(&this->bodyBreak, limbIndex, 0, 6, 8, dList, BODYBREAK_OBJECT_DEFAULT);
}
void EnSb_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnSb* this = THIS;
EnSb* this = (EnSb*)thisx;
Vec3f flamePos;
Vec3f* offset;
s16 fireDecr;