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

10
src/overlays/actors/ovl_En_Viewer/z_en_viewer.c
View file

@ -17,8 +17,6 @@
#define FLAGS 0x00000010
#define THIS ((EnViewer*)thisx)
void EnViewer_Init(Actor* thisx, GlobalContext* globalCtx);
void EnViewer_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnViewer_Update(Actor* thisx, GlobalContext* globalCtx);
@ -90,7 +88,7 @@ void EnViewer_SetupAction(EnViewer* this, EnViewerActionFunc actionFunc) {
}
void EnViewer_Init(Actor* thisx, GlobalContext* globalCtx) {
EnViewer* this = THIS;
EnViewer* this = (EnViewer*)thisx;
u8 type;
Actor_ProcessInitChain(&this->actor, sInitChain);
@ -108,7 +106,7 @@ void EnViewer_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void EnViewer_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnViewer* this = THIS;
EnViewer* this = (EnViewer*)thisx;
func_800A6888(globalCtx, &this->skin);
}
@ -479,7 +477,7 @@ void EnViewer_UpdateImpl(EnViewer* this, GlobalContext* globalCtx) {
}
void EnViewer_Update(Actor* thisx, GlobalContext* globalCtx) {
EnViewer* this = THIS;
EnViewer* this = (EnViewer*)thisx;
gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[this->animObjBankIndex].segment);
this->actionFunc(this, globalCtx);
@ -693,7 +691,7 @@ static EnViewerDrawFunc sDrawFuncs[] = {
};
void EnViewer_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnViewer* this = THIS;
EnViewer* this = (EnViewer*)thisx;
s32 pad;
s16 type;