summaryrefslogtreecommitdiff
path: root/src/code/z_player_lib.c
diff options
context:
space:
mode:
authorengineer124 <47598039+engineer124@users.noreply.github.com>2023-11-23 15:41:25 +1100
committerGitHub <noreply@github.com>2023-11-23 15:41:25 +1100
commitc75d3b97d380be93dec40144595e31d207831183 (patch)
treecf22cebe7e480744865c1c863279f12db70eedc2 /src/code/z_player_lib.c
parent282f84e3f37bc629c7e57974d5a353e6d40ccdc9 (diff)
Animation Cleanup: En_O* (#1506)
* anim O cleanup * fix bss * PR Review
Diffstat (limited to 'src/code/z_player_lib.c')
-rw-r--r--src/code/z_player_lib.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c
index 661516dba..7e9c2a1aa 100644
--- a/src/code/z_player_lib.c
+++ b/src/code/z_player_lib.c
@@ -2856,8 +2856,8 @@ void Player_DrawCouplesMask(PlayState* play, Player* player) {
}
void Player_DrawCircusLeadersMask(PlayState* play, Player* player) {
- static Vec3f bubbleVelocity = { 0.0f, 0.0f, 0.0f };
- static Vec3f bubbleAccel = { 0.0f, 0.0f, 0.0f };
+ static Vec3f sBubbleVelocity = { 0.0f, 0.0f, 0.0f };
+ static Vec3f sBubbleAccel = { 0.0f, 0.0f, 0.0f };
Gfx* gfx;
s32 i;
@@ -2897,8 +2897,8 @@ void Player_DrawCircusLeadersMask(PlayState* play, Player* player) {
s16 phi_s0 = speedXZ * 2000.0f;
f32 temp_f20;
- bubbleVelocity.y = speedXZ * 0.4f;
- bubbleAccel.y = -0.3f;
+ sBubbleVelocity.y = speedXZ * 0.4f;
+ sBubbleAccel.y = -0.3f;
if (phi_s0 > 0x3E80) {
phi_s0 = 0x3E80;
@@ -2908,10 +2908,10 @@ void Player_DrawCircusLeadersMask(PlayState* play, Player* player) {
temp_f20 = speedXZ * 0.2f;
temp_f20 = CLAMP_MAX(temp_f20, 4.0f);
- bubbleVelocity.x = -Math_SinS(phi_s0) * temp_f20;
- bubbleVelocity.z = -Math_CosS(phi_s0) * temp_f20;
+ sBubbleVelocity.x = -Math_SinS(phi_s0) * temp_f20;
+ sBubbleVelocity.z = -Math_CosS(phi_s0) * temp_f20;
- EffectSsDtBubble_SpawnColorProfile(play, &D_801F59B0[i], &bubbleVelocity, &bubbleAccel, 20, 20, 3, 0);
+ EffectSsDtBubble_SpawnColorProfile(play, &D_801F59B0[i], &sBubbleVelocity, &sBubbleAccel, 20, 20, 3, 0);
D_801F59C8[i] -= 400;
}
}