mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 06:21: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_Mir_Ray/z_mir_ray.c
View file

@ -9,8 +9,6 @@
#define FLAGS 0x00000030
#define THIS ((MirRay*)thisx)
void MirRay_Init(Actor* thisx, GlobalContext* globalCtx);
void MirRay_Destroy(Actor* thisx, GlobalContext* globalCtx);
void MirRay_Update(Actor* thisx, GlobalContext* globalCtx);
@ -162,7 +160,7 @@ void MirRay_MakeShieldLight(MirRay* this, GlobalContext* globalCtx) {
void MirRay_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
MirRay* this = THIS;
MirRay* this = (MirRay*)thisx;
MirRayDataEntry* dataEntry = &sMirRayData[this->actor.params];
Actor_ProcessInitChain(&this->actor, sInitChain);
@ -227,7 +225,7 @@ void MirRay_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void MirRay_Destroy(Actor* thisx, GlobalContext* globalCtx) {
MirRay* this = THIS;
MirRay* this = (MirRay*)thisx;
LightContext_RemoveLight(globalCtx, &globalCtx->lightCtx, this->lightNode);
@ -240,7 +238,7 @@ void MirRay_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void MirRay_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
MirRay* this = THIS;
MirRay* this = (MirRay*)thisx;
Player* player = GET_PLAYER(globalCtx);
D_80B8E670 = 0;
@ -482,7 +480,7 @@ void MirRay_ReflectedBeam(MirRay* this, GlobalContext* globalCtx, MirRayShieldRe
}
void MirRay_Draw(Actor* thisx, GlobalContext* globalCtx) {
MirRay* this = THIS;
MirRay* this = (MirRay*)thisx;
Player* player = GET_PLAYER(globalCtx);
s32 i;
MirRayShieldReflection reflection[6];