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

@ -9,8 +9,6 @@
#define FLAGS 0x00000000
#define THIS ((EnWood02*)thisx)
void EnWood02_Init(Actor* thisx, GlobalContext* globalCtx);
void EnWood02_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnWood02_Update(Actor* thisx, GlobalContext* globalCtx);
@ -164,7 +162,7 @@ void EnWood02_Init(Actor* thisx, GlobalContext* globalCtx2) {
s16 spawnType;
f32 actorScale;
GlobalContext* globalCtx = globalCtx2;
EnWood02* this = THIS;
EnWood02* this = (EnWood02*)thisx;
CollisionPoly* outPoly;
s32 bgId;
f32 floorY;
@ -293,7 +291,7 @@ void EnWood02_Init(Actor* thisx, GlobalContext* globalCtx2) {
}
void EnWood02_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnWood02* this = THIS;
EnWood02* this = (EnWood02*)thisx;
if (this->actor.params <= WOOD_TREE_KAKARIKO_ADULT) {
Collider_DestroyCylinder(globalCtx, &this->collider);
@ -302,7 +300,7 @@ void EnWood02_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void EnWood02_Update(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
EnWood02* this = THIS;
EnWood02* this = (EnWood02*)thisx;
f32 wobbleAmplitude;
u8 new_var;
u8 phi_v0;
@ -414,7 +412,7 @@ void EnWood02_Update(Actor* thisx, GlobalContext* globalCtx2) {
}
void EnWood02_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnWood02* this = THIS;
EnWood02* this = (EnWood02*)thisx;
s16 type;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
u8 red;