mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-15 03:20:35 +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

32
src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
View file

@ -12,8 +12,6 @@
#define FLAGS 0x00000030
#define THIS ((DemoEffect*)thisx)
void DemoEffect_Init(Actor* thisx, GlobalContext* globalCtx);
void DemoEffect_Destroy(Actor* thisx, GlobalContext* globalCtx);
void DemoEffect_Update(Actor* thisx, GlobalContext* globalCtx);
@ -178,7 +176,7 @@ void DemoEffect_InitGetItem(DemoEffect* this) {
*/
void DemoEffect_Init(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
DemoEffect* this = THIS;
DemoEffect* this = (DemoEffect*)thisx;
s32 effectType;
s32 lightEffect;
s32 objectIndex;
@ -519,7 +517,7 @@ void DemoEffect_Init(Actor* thisx, GlobalContext* globalCtx2) {
* Main Actor Destroy function
*/
void DemoEffect_Destroy(Actor* thisx, GlobalContext* globalCtx) {
DemoEffect* this = THIS;
DemoEffect* this = (DemoEffect*)thisx;
s32 effectType = (this->actor.params & 0x00FF);
if (effectType == DEMO_EFFECT_TIMEWARP_MASTERSWORD || effectType == DEMO_EFFECT_TIMEWARP_TIMEBLOCK_LARGE ||
@ -1646,7 +1644,7 @@ void DemoEffect_UpdateDust(DemoEffect* this, GlobalContext* globalCtx) {
* This is the main Actor Update Function.
*/
void DemoEffect_Update(Actor* thisx, GlobalContext* globalCtx) {
DemoEffect* this = THIS;
DemoEffect* this = (DemoEffect*)thisx;
this->updateFunc(this, globalCtx);
}
@ -1666,7 +1664,7 @@ s32 DemoEffect_CheckCsAction(DemoEffect* this, GlobalContext* globalCtx, s32 csA
* Draw function for the Jewel Actor.
*/
void DemoEffect_DrawJewel(Actor* thisx, GlobalContext* globalCtx2) {
DemoEffect* this = THIS;
DemoEffect* this = (DemoEffect*)thisx;
GlobalContext* globalCtx = globalCtx2;
u32 frames = this->jewel.timer;
@ -1728,7 +1726,7 @@ void DemoEffect_DrawJewel(Actor* thisx, GlobalContext* globalCtx2) {
* Draw function for the Crystal Light Actor.
*/
void DemoEffect_DrawCrystalLight(Actor* thisx, GlobalContext* globalCtx) {
DemoEffect* this = THIS;
DemoEffect* this = (DemoEffect*)thisx;
DemoEffect* parent = (DemoEffect*)this->actor.parent;
u32 frames = globalCtx->gameplayFrames & 0xFFFF;
@ -1776,7 +1774,7 @@ void DemoEffect_DrawCrystalLight(Actor* thisx, GlobalContext* globalCtx) {
* Draw function for the Fire Ball Actor.
*/
void DemoEffect_DrawFireBall(Actor* thisx, GlobalContext* globalCtx) {
DemoEffect* this = THIS;
DemoEffect* this = (DemoEffect*)thisx;
u32 frames = globalCtx->gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2701);
@ -1798,7 +1796,7 @@ void DemoEffect_DrawFireBall(Actor* thisx, GlobalContext* globalCtx) {
* This draws either Din, Nayru, or Farore based on the colors set in the DemoEffect struct.
*/
void DemoEffect_DrawGodLgt(Actor* thisx, GlobalContext* globalCtx) {
DemoEffect* this = THIS;
DemoEffect* this = (DemoEffect*)thisx;
s32 pad;
u32 frames = globalCtx->gameplayFrames;
@ -1857,7 +1855,7 @@ void DemoEffect_DrawGodLgt(Actor* thisx, GlobalContext* globalCtx) {
* Draw function for the Light Effect Actor.
*/
void DemoEffect_DrawLightEffect(Actor* thisx, GlobalContext* globalCtx) {
DemoEffect* this = THIS;
DemoEffect* this = (DemoEffect*)thisx;
u8* alpha;
Gfx* disp;
@ -1899,7 +1897,7 @@ void DemoEffect_DrawLightEffect(Actor* thisx, GlobalContext* globalCtx) {
* Draw function for the Blue Orb Actor.
*/
void DemoEffect_DrawBlueOrb(Actor* thisx, GlobalContext* globalCtx) {
DemoEffect* this = THIS;
DemoEffect* this = (DemoEffect*)thisx;
s32 pad2;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2892);
@ -1919,7 +1917,7 @@ void DemoEffect_DrawBlueOrb(Actor* thisx, GlobalContext* globalCtx) {
* Draw function for the Lgt Shower Actor.
*/
void DemoEffect_DrawLgtShower(Actor* thisx, GlobalContext* globalCtx) {
DemoEffect* this = THIS;
DemoEffect* this = (DemoEffect*)thisx;
s32 pad;
u32 frames = globalCtx->gameplayFrames;
@ -1940,7 +1938,7 @@ void DemoEffect_DrawLgtShower(Actor* thisx, GlobalContext* globalCtx) {
* Draw function for the Light Ring Actor.
*/
void DemoEffect_DrawLightRing(Actor* thisx, GlobalContext* globalCtx2) {
DemoEffect* this = THIS;
DemoEffect* this = (DemoEffect*)thisx;
GlobalContext* globalCtx = globalCtx2;
u32 frames = this->lightRing.timer;
@ -1963,7 +1961,7 @@ void DemoEffect_DrawLightRing(Actor* thisx, GlobalContext* globalCtx2) {
* Draw function for the Triforce Spot Actor.
*/
void DemoEffect_DrawTriforceSpot(Actor* thisx, GlobalContext* globalCtx) {
DemoEffect* this = THIS;
DemoEffect* this = (DemoEffect*)thisx;
s32 pad;
Vtx* vertices = SEGMENTED_TO_VIRTUAL(gTriforceVtx);
u32 frames = globalCtx->gameplayFrames;
@ -2029,7 +2027,7 @@ void DemoEffect_DrawTriforceSpot(Actor* thisx, GlobalContext* globalCtx) {
* This is either Medals or Light Arrows based on the drawId.
*/
void DemoEffect_DrawGetItem(Actor* thisx, GlobalContext* globalCtx) {
DemoEffect* this = THIS;
DemoEffect* this = (DemoEffect*)thisx;
if (!DemoEffect_CheckCsAction(this, globalCtx, 1) && !DemoEffect_CheckCsAction(this, globalCtx, 4)) {
if (!this->getItem.isLoaded) {
this->getItem.isLoaded = 1;
@ -2046,7 +2044,7 @@ void DemoEffect_DrawGetItem(Actor* thisx, GlobalContext* globalCtx) {
*/
s32 DemoEffect_DrawTimewarpLimbs(GlobalContext* globalCtx, SkelAnimeCurve* skelCuve, s32 limbIndex, void* thisx) {
s32 pad;
DemoEffect* this = THIS;
DemoEffect* this = (DemoEffect*)thisx;
u32 frames = globalCtx->gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 3154);
@ -2072,7 +2070,7 @@ s32 DemoEffect_DrawTimewarpLimbs(GlobalContext* globalCtx, SkelAnimeCurve* skelC
* Draw function for the Time Warp Actors.
*/
void DemoEffect_DrawTimeWarp(Actor* thisx, GlobalContext* globalCtx) {
DemoEffect* this = THIS;
DemoEffect* this = (DemoEffect*)thisx;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
u8 effectType = (this->actor.params & 0x00FF);