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

PlayState Rename (#1231)

Browse source 
* global context -> play

* fix PlayState* PlayState
This commit is contained in:
fig02 2022-05-21 14:23:43 -04:00 • committed by GitHub
parent 154f44b6da
commit 2e6279bc8e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
912 changed files with 40489 additions and 41078 deletions
Download patch file Download diff file Expand all files Collapse all files

56
src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
View file

@ -9,18 +9,18 @@
#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5)
void EffDust_Init(Actor* thisx, GlobalContext* globalCtx);
void EffDust_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EffDust_Update(Actor* thisx, GlobalContext* globalCtx);
void EffDust_Draw(Actor* thisx, GlobalContext* globalCtx);
void EffDust_Init(Actor* thisx, PlayState* play);
void EffDust_Destroy(Actor* thisx, PlayState* play);
void EffDust_Update(Actor* thisx, PlayState* play);
void EffDust_Draw(Actor* thisx, PlayState* play);
void EffDust_InitPosAndDistance(EffDust* this);
void EffDust_UpdateFunc_8099DB28(EffDust* this, GlobalContext* globalCtx);
void EffDust_UpdateFunc_8099DD74(EffDust* this, GlobalContext* globalCtx);
void EffDust_UpdateFunc_8099DFC0(EffDust* this, GlobalContext* globalCtx);
void EffDust_DrawFunc_8099E4F4(Actor* thisx, GlobalContext* globalCtx);
void EffDust_DrawFunc_8099E784(Actor* thisx, GlobalContext* globalCtx);
void EffDust_UpdateFunc_8099DB28(EffDust* this, PlayState* play);
void EffDust_UpdateFunc_8099DD74(EffDust* this, PlayState* play);
void EffDust_UpdateFunc_8099DFC0(EffDust* this, PlayState* play);
void EffDust_DrawFunc_8099E4F4(Actor* thisx, PlayState* play);
void EffDust_DrawFunc_8099E784(Actor* thisx, PlayState* play);
const ActorInit Eff_Dust_InitVars = {
ACTOR_EFF_DUST,
@ -59,7 +59,7 @@ void EffDust_InitPosAndDistance(EffDust* this) {
this->index = 0;
}
void EffDust_Init(Actor* thisx, GlobalContext* globalCtx) {
void EffDust_Init(Actor* thisx, PlayState* play) {
EffDust* this = (EffDust*)thisx;
EffDustType dustEffect = this->actor.params;
@ -109,10 +109,10 @@ void EffDust_Init(Actor* thisx, GlobalContext* globalCtx) {
this->life = 10;
}
void EffDust_Destroy(Actor* thisx, GlobalContext* globalCtx) {
void EffDust_Destroy(Actor* thisx, PlayState* play) {
}
void EffDust_UpdateFunc_8099DB28(EffDust* this, GlobalContext* globalCtx) {
void EffDust_UpdateFunc_8099DB28(EffDust* this, PlayState* play) {
s16 theta;
s16 fi;
f32* distanceTraveled = this->distanceTraveled;
@ -141,7 +141,7 @@ void EffDust_UpdateFunc_8099DB28(EffDust* this, GlobalContext* globalCtx) {
}
}
void EffDust_UpdateFunc_8099DD74(EffDust* this, GlobalContext* globalCtx) {
void EffDust_UpdateFunc_8099DD74(EffDust* this, PlayState* play) {
s16 theta;
s16 fi;
f32* distanceTraveled = this->distanceTraveled;
@ -170,9 +170,9 @@ void EffDust_UpdateFunc_8099DD74(EffDust* this, GlobalContext* globalCtx) {
}
}
void EffDust_UpdateFunc_8099DFC0(EffDust* this, GlobalContext* globalCtx) {
void EffDust_UpdateFunc_8099DFC0(EffDust* this, PlayState* play) {
s16 theta;
Player* player = GET_PLAYER(globalCtx);
Player* player = GET_PLAYER(play);
Actor* parent = this->actor.parent;
f32* distanceTraveled = this->distanceTraveled;
s32 i;
@ -253,16 +253,16 @@ void EffDust_UpdateFunc_8099DFC0(EffDust* this, GlobalContext* globalCtx) {
}
}
void EffDust_Update(Actor* thisx, GlobalContext* globalCtx) {
void EffDust_Update(Actor* thisx, PlayState* play) {
EffDust* this = (EffDust*)thisx;
this->actionFunc(this, globalCtx);
this->actionFunc(this, play);
}
void EffDust_DrawFunc_8099E4F4(Actor* thisx, GlobalContext* globalCtx2) {
void EffDust_DrawFunc_8099E4F4(Actor* thisx, PlayState* play2) {
EffDust* this = (EffDust*)thisx;
GlobalContext* globalCtx = globalCtx2;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
PlayState* play = play2;
GraphicsContext* gfxCtx = play->state.gfxCtx;
Vec3f* initialPositions;
f32* distanceTraveled;
s32 i;
@ -290,7 +290,7 @@ void EffDust_DrawFunc_8099E4F4(Actor* thisx, GlobalContext* globalCtx2) {
MTXMODE_NEW);
Matrix_Scale(this->scalingFactor, this->scalingFactor, this->scalingFactor, MTXMODE_APPLY);
Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY);
Matrix_Mult(&play->billboardMtxF, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_dust.c", 449),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@ -306,15 +306,15 @@ void EffDust_DrawFunc_8099E4F4(Actor* thisx, GlobalContext* globalCtx2) {
CLOSE_DISPS(gfxCtx, "../z_eff_dust.c", 458);
}
void EffDust_DrawFunc_8099E784(Actor* thisx, GlobalContext* globalCtx2) {
void EffDust_DrawFunc_8099E784(Actor* thisx, PlayState* play2) {
EffDust* this = (EffDust*)thisx;
GlobalContext* globalCtx = globalCtx2;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
PlayState* play = play2;
GraphicsContext* gfxCtx = play->state.gfxCtx;
f32* distanceTraveled;
Vec3f* initialPositions;
s32 i;
f32 aux;
Player* player = GET_PLAYER(globalCtx);
Player* player = GET_PLAYER(play);
OPEN_DISPS(gfxCtx, "../z_eff_dust.c", 472);
@ -351,7 +351,7 @@ void EffDust_DrawFunc_8099E784(Actor* thisx, GlobalContext* globalCtx2) {
Matrix_Scale(*distanceTraveled * this->scalingFactor, *distanceTraveled * this->scalingFactor,
*distanceTraveled * this->scalingFactor, MTXMODE_APPLY);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_ReplaceRotation(&play->billboardMtxF);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_dust.c", 506),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@ -365,8 +365,8 @@ void EffDust_DrawFunc_8099E784(Actor* thisx, GlobalContext* globalCtx2) {
CLOSE_DISPS(gfxCtx, "../z_eff_dust.c", 515);
}
void EffDust_Draw(Actor* thisx, GlobalContext* globalCtx) {
void EffDust_Draw(Actor* thisx, PlayState* play) {
EffDust* this = (EffDust*)thisx;
this->drawFunc(thisx, globalCtx);
this->drawFunc(thisx, play);
}

4
src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h
View file

@ -6,8 +6,8 @@
struct EffDust;
typedef void (*EffDustActionFunc)(struct EffDust*, GlobalContext*);
typedef void (*EffDustDrawFunc)(Actor*, GlobalContext*);
typedef void (*EffDustActionFunc)(struct EffDust*, PlayState*);
typedef void (*EffDustDrawFunc)(Actor*, PlayState*);
typedef struct EffDust {
/* 0x0000 */ Actor actor;