mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-23 07:21:19 +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_Butte/z_en_butte.c
View file

@ -11,8 +11,6 @@
#define FLAGS 0x00000000
#define THIS ((EnButte*)thisx)
void EnButte_Init(Actor* thisx, GlobalContext* globalCtx);
void EnButte_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnButte_Update(Actor* thisx, GlobalContext* globalCtx);
@ -148,7 +146,7 @@ static InitChainEntry sInitChain[] = {
};
void EnButte_Init(Actor* thisx, GlobalContext* globalCtx) {
EnButte* this = THIS;
EnButte* this = (EnButte*)thisx;
if (this->actor.params == -1) {
this->actor.params = 0;
@ -178,7 +176,7 @@ void EnButte_Init(Actor* thisx, GlobalContext* globalCtx) {
void EnButte_Destroy(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
EnButte* this = THIS;
EnButte* this = (EnButte*)thisx;
Collider_DestroyJntSph(globalCtx, &this->collider);
}
@ -385,7 +383,7 @@ void EnButte_WaitToDie(EnButte* this, GlobalContext* globalCtx) {
}
void EnButte_Update(Actor* thisx, GlobalContext* globalCtx) {
EnButte* this = THIS;
EnButte* this = (EnButte*)thisx;
if ((this->actor.child != NULL) && (this->actor.child->update == NULL) && (this->actor.child != &this->actor)) {
this->actor.child = NULL;
@ -422,7 +420,7 @@ void EnButte_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void EnButte_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnButte* this = THIS;
EnButte* this = (EnButte*)thisx;
if (this->drawSkelAnime) {
func_80093D18(globalCtx->state.gfxCtx);