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

@ -9,8 +9,6 @@
#define FLAGS 0x02000010
#define THIS ((OceffWipe*)thisx)
void OceffWipe_Init(Actor* thisx, GlobalContext* globalCtx);
void OceffWipe_Destroy(Actor* thisx, GlobalContext* globalCtx);
void OceffWipe_Update(Actor* thisx, GlobalContext* globalCtx);
@ -29,7 +27,7 @@ const ActorInit Oceff_Wipe_InitVars = {
};
void OceffWipe_Init(Actor* thisx, GlobalContext* globalCtx) {
OceffWipe* this = THIS;
OceffWipe* this = (OceffWipe*)thisx;
Actor_SetScale(&this->actor, 0.1f);
this->timer = 0;
@ -38,7 +36,7 @@ void OceffWipe_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void OceffWipe_Destroy(Actor* thisx, GlobalContext* globalCtx) {
OceffWipe* this = THIS;
OceffWipe* this = (OceffWipe*)thisx;
Player* player = GET_PLAYER(globalCtx);
func_800876C8(globalCtx);
@ -48,7 +46,7 @@ void OceffWipe_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
void OceffWipe_Update(Actor* thisx, GlobalContext* globalCtx) {
OceffWipe* this = THIS;
OceffWipe* this = (OceffWipe*)thisx;
this->actor.world.pos = GET_ACTIVE_CAM(globalCtx)->eye;
if (this->timer < 100) {
@ -67,7 +65,7 @@ static u8 sAlphaIndices[] = {
void OceffWipe_Draw(Actor* thisx, GlobalContext* globalCtx) {
u32 scroll = globalCtx->state.frames & 0xFF;
OceffWipe* this = THIS;
OceffWipe* this = (OceffWipe*)thisx;
f32 z;
s32 pad;
u8 alphaTable[3];