mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-20 22:11: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

12
src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
View file

@ -13,8 +13,6 @@
#define FLAGS 0x00000010
#define THIS ((DemoSa*)thisx)
void DemoSa_Init(Actor* thisx, GlobalContext* globalCtx);
void DemoSa_Destroy(Actor* thisx, GlobalContext* globalCtx);
void DemoSa_Update(Actor* thisx, GlobalContext* globalCtx);
@ -100,7 +98,7 @@ const ActorInit Demo_Sa_InitVars = {
};
void DemoSa_Destroy(Actor* thisx, GlobalContext* globalCtx) {
DemoSa* this = THIS;
DemoSa* this = (DemoSa*)thisx;
SkelAnime_Free(&this->skelAnime, globalCtx);
}
@ -750,7 +748,7 @@ void func_8098FD0C(DemoSa* this, GlobalContext* globalCtx) {
}
void DemoSa_Update(Actor* thisx, GlobalContext* globalCtx) {
DemoSa* this = THIS;
DemoSa* this = (DemoSa*)thisx;
if (this->action < 0 || this->action >= 21 || sActionFuncs[this->action] == NULL) {
osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
@ -760,7 +758,7 @@ void DemoSa_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void DemoSa_Init(Actor* thisx, GlobalContext* globalCtx) {
DemoSa* this = THIS;
DemoSa* this = (DemoSa*)thisx;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
@ -783,7 +781,7 @@ void DemoSa_Init(Actor* thisx, GlobalContext* globalCtx) {
}
s32 DemoSa_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
DemoSa* this = THIS;
DemoSa* this = (DemoSa*)thisx;
if ((limbIndex == 15) && (this->unk_1B0 != 0)) {
*dList = gSariaRightHandAndOcarinaDL;
@ -820,7 +818,7 @@ void DemoSa_DrawOpa(DemoSa* this, GlobalContext* globalCtx) {
}
void DemoSa_Draw(Actor* thisx, GlobalContext* globalCtx) {
DemoSa* this = THIS;
DemoSa* this = (DemoSa*)thisx;
if (this->drawConfig < 0 || this->drawConfig >= 3 || sDrawFuncs[this->drawConfig] == NULL) {
osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);