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_Demo_Go/z_demo_go.c
View file

@ -10,8 +10,6 @@
#define FLAGS 0x00000010
#define THIS ((DemoGo*)thisx)
void DemoGo_Init(Actor* thisx, GlobalContext* globalCtx);
void DemoGo_Destroy(Actor* thisx, GlobalContext* globalCtx);
void DemoGo_Update(Actor* thisx, GlobalContext* globalCtx);
@ -82,7 +80,7 @@ void func_8097C8A8(DemoGo* this, GlobalContext* globalCtx) {
}
void DemoGo_Destroy(Actor* thisx, GlobalContext* globalCtx) {
DemoGo* this = THIS;
DemoGo* this = (DemoGo*)thisx;
SkelAnime_Free(&this->skelAnime, globalCtx);
}
@ -303,7 +301,7 @@ void func_8097D130(DemoGo* this, GlobalContext* globalCtx) {
}
void DemoGo_Update(Actor* thisx, GlobalContext* globalCtx) {
DemoGo* this = THIS;
DemoGo* this = (DemoGo*)thisx;
if (this->action < 0 || this->action >= 7 || D_8097D44C[this->action] == 0) {
osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
@ -313,7 +311,7 @@ void DemoGo_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void DemoGo_Init(Actor* thisx, GlobalContext* globalCtx) {
DemoGo* this = THIS;
DemoGo* this = (DemoGo*)thisx;
AnimationHeader* animation = &gGoronAnim_004930;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
@ -345,7 +343,7 @@ void func_8097D29C(DemoGo* this, GlobalContext* globalCtx) {
}
void DemoGo_Draw(Actor* thisx, GlobalContext* globalCtx) {
DemoGo* this = THIS;
DemoGo* this = (DemoGo*)thisx;
if (this->drawConfig < 0 || this->drawConfig >= 2 || D_8097D468[this->drawConfig] == NULL) {
osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);