1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-20 14:01:15 +00:00

Remove THIS macro (#1047)

* 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

View file

@ -9,8 +9,6 @@
#define FLAGS 0x00000010
#define THIS ((EnLightbox*)thisx)
void EnLightbox_Init(Actor* thisx, GlobalContext* globalCtx);
void EnLightbox_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnLightbox_Update(Actor* thisx, GlobalContext* globalCtx);
@ -30,7 +28,7 @@ const ActorInit En_Lightbox_InitVars = {
void EnLightbox_Init(Actor* thisx, GlobalContext* globalCtx) {
CollisionHeader* colHeader = NULL;
EnLightbox* this = THIS;
EnLightbox* this = (EnLightbox*)thisx;
s32 pad[4];
switch (thisx->params) {
@ -62,13 +60,13 @@ void EnLightbox_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void EnLightbox_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnLightbox* this = THIS;
EnLightbox* this = (EnLightbox*)thisx;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
void EnLightbox_Update(Actor* thisx, GlobalContext* globalCtx) {
EnLightbox* this = THIS;
EnLightbox* this = (EnLightbox*)thisx;
if (this->dyna.unk_162 != 0) {
if (Actor_HasNoParent(thisx, globalCtx)) {