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

18
src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c
View file

@ -9,16 +9,16 @@
#define rScale regs[0]
u32 EffectSsBubble_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx);
void EffectSsBubble_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this);
void EffectSsBubble_Update(GlobalContext* globalCtx, u32 index, EffectSs* this);
u32 EffectSsBubble_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx);
void EffectSsBubble_Draw(PlayState* play, u32 index, EffectSs* this);
void EffectSsBubble_Update(PlayState* play, u32 index, EffectSs* this);
EffectSsInit Effect_Ss_Bubble_InitVars = {
EFFECT_SS_BUBBLE,
EffectSsBubble_Init,
};
u32 EffectSsBubble_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
u32 EffectSsBubble_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx) {
EffectSsBubbleInitParams* initParams = (EffectSsBubbleInitParams*)initParamsx;
//! @bug Rand_ZeroOne in the macro means a random number is generated for both parts of the macro.
@ -37,8 +37,8 @@ u32 EffectSsBubble_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, voi
return 1;
}
void EffectSsBubble_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
void EffectSsBubble_Draw(PlayState* play, u32 index, EffectSs* this) {
GraphicsContext* gfxCtx = play->state.gfxCtx;
f32 scale = this->rScale / 100.0f;
OPEN_DISPS(gfxCtx, "../z_eff_ss_bubble.c", 154);
@ -56,7 +56,7 @@ void EffectSsBubble_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
CLOSE_DISPS(gfxCtx, "../z_eff_ss_bubble.c", 179);
}
void EffectSsBubble_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {
void EffectSsBubble_Update(PlayState* play, u32 index, EffectSs* this) {
WaterBox* waterBox;
f32 waterSurfaceY;
Vec3f ripplePos;
@ -64,7 +64,7 @@ void EffectSsBubble_Update(GlobalContext* globalCtx, u32 index, EffectSs* this)
waterSurfaceY = this->pos.y;
// kill bubble if it's out of range of a water box
if (!WaterBox_GetSurface1(globalCtx, &globalCtx->colCtx, this->pos.x, this->pos.z, &waterSurfaceY, &waterBox)) {
if (!WaterBox_GetSurface1(play, &play->colCtx, this->pos.x, this->pos.z, &waterSurfaceY, &waterBox)) {
this->life = -1;
return;
}
@ -73,7 +73,7 @@ void EffectSsBubble_Update(GlobalContext* globalCtx, u32 index, EffectSs* this)
ripplePos.x = this->pos.x;
ripplePos.y = waterSurfaceY;
ripplePos.z = this->pos.z;
EffectSsGRipple_Spawn(globalCtx, &ripplePos, 0, 80, 0);
EffectSsGRipple_Spawn(play, &ripplePos, 0, 80, 0);
this->life = -1;
} else {
this->life++;