mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 14:31:17 +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

6
src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
View file

@ -10,8 +10,6 @@
#define FLAGS 0x00000010
#define THIS ((ElfMsg*)thisx)
void ElfMsg_Init(Actor* thisx, GlobalContext* globalCtx);
void ElfMsg_Destroy(Actor* thisx, GlobalContext* globalCtx);
void ElfMsg_Update(Actor* thisx, GlobalContext* globalCtx);
@ -71,7 +69,7 @@ s32 ElfMsg_KillCheck(ElfMsg* this, GlobalContext* globalCtx) {
}
void ElfMsg_Init(Actor* thisx, GlobalContext* globalCtx) {
ElfMsg* this = THIS;
ElfMsg* this = (ElfMsg*)thisx;
// "Conditions for Elf Tag disappearing"
osSyncPrintf(VT_FGCOL(CYAN) "\nエルフ タグ 消える条件 %d" VT_RST "\n", (thisx->params >> 8) & 0x3F);
@ -148,7 +146,7 @@ void ElfMsg_CallNaviCylinder(ElfMsg* this, GlobalContext* globalCtx) {
}
void ElfMsg_Update(Actor* thisx, GlobalContext* globalCtx) {
ElfMsg* this = THIS;
ElfMsg* this = (ElfMsg*)thisx;
if (!ElfMsg_KillCheck(this, globalCtx)) {
if (Actor_ProcessTalkRequest(&this->actor, globalCtx)) {