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_Ru2/z_en_ru2.c
View file

@ -11,8 +11,6 @@
#define FLAGS 0x00000010
#define THIS ((EnRu2*)thisx)
void EnRu2_Init(Actor* thisx, GlobalContext* globalCtx);
void EnRu2_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnRu2_Update(Actor* thisx, GlobalContext* globalCtx);
@ -92,7 +90,7 @@ const ActorInit En_Ru2_InitVars = {
};
void func_80AF2550(Actor* thisx, GlobalContext* globalCtx) {
EnRu2* this = THIS;
EnRu2* this = (EnRu2*)thisx;
Collider_InitCylinder(globalCtx, &this->collider);
Collider_SetCylinderType1(globalCtx, &this->collider, &this->actor, &sCylinderInit);
@ -106,7 +104,7 @@ void func_80AF259C(EnRu2* this, GlobalContext* globalCtx) {
}
void EnRu2_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnRu2* this = THIS;
EnRu2* this = (EnRu2*)thisx;
Collider_DestroyCylinder(globalCtx, &this->collider);
}
@ -756,7 +754,7 @@ void func_80AF3D60(EnRu2* this, GlobalContext* globalCtx) {
}
void EnRu2_Update(Actor* thisx, GlobalContext* globalCtx) {
EnRu2* this = THIS;
EnRu2* this = (EnRu2*)thisx;
if ((this->action < 0) || (this->action >= ARRAY_COUNT(sActionFuncs)) || (sActionFuncs[this->action] == NULL)) {
// "Main Mode is improper!"
@ -767,7 +765,7 @@ void EnRu2_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void EnRu2_Init(Actor* thisx, GlobalContext* globalCtx) {
EnRu2* this = THIS;
EnRu2* this = (EnRu2*)thisx;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
func_80AF2550(thisx, globalCtx);
@ -817,7 +815,7 @@ void func_80AF3F20(EnRu2* this, GlobalContext* globalCtx) {
}
void EnRu2_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnRu2* this = THIS;
EnRu2* this = (EnRu2*)thisx;
if ((this->drawConfig < 0) || (this->drawConfig >= ARRAY_COUNT(sDrawFuncs)) ||
(sDrawFuncs[this->drawConfig] == 0)) {