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

@ -11,8 +11,6 @@
#define FLAGS 0x02000009
#define THIS ((EnGs*)thisx)
void EnGs_Init(Actor* thisx, GlobalContext* globalCtx);
void EnGs_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnGs_Update(Actor* thisx, GlobalContext* globalCtx);
@ -97,7 +95,7 @@ static InitChainEntry sInitChain[] = {
};
void EnGs_Init(Actor* thisx, GlobalContext* globalCtx) {
EnGs* this = THIS;
EnGs* this = (EnGs*)thisx;
Actor_ProcessInitChain(thisx, sInitChain);
Collider_InitCylinder(globalCtx, &this->collider);
@ -517,7 +515,7 @@ void func_80A4F77C(EnGs* this) {
void EnGs_Update(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
EnGs* this = THIS;
EnGs* this = (EnGs*)thisx;
Actor_SetFocus(&this->actor, 23.0f);
if (!(this->unk_19E & 0x10)) {
@ -562,7 +560,7 @@ void EnGs_Update(Actor* thisx, GlobalContext* globalCtx2) {
}
void EnGs_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnGs* this = THIS;
EnGs* this = (EnGs*)thisx;
s32 tmp;
u32 frames;