thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

POSITION music

Browse source 
Play SA2 "shwing" at title card; play POSITION music once
camera is steady (instantly in 1v1).

Encore: play portal warp sound instead of "shwing"; play
portal drone instead of POSITION music, always start
instantly.
This commit is contained in:
James R 2022-02-15 15:49:49 -08:00
parent 62b5f9c90f
commit 9095261a18
3 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/p_tick.c
View file

@ -617,6 +617,19 @@ void P_Ticker(boolean run)
S_ShowMusicCredit();
}
if (encoremode)
{
// Encore humming starts immediately.
if (leveltime == 3)
S_ChangeMusicInternal("encore", true);
}
else
{
// Plays the POSITION music after the camera spin
if (leveltime == introtime)
S_ChangeMusicInternal("postn", true);
}
ps_lua_thinkframe_time = I_GetPreciseTime();
LUAh_ThinkFrame();
ps_lua_thinkframe_time = I_GetPreciseTime() - ps_lua_thinkframe_time;

9
src/p_user.c
View file

@ -804,14 +804,7 @@ void P_RestoreMusic(player_t *player)
return;
// Event - Level Start
if (leveltime < (starttime + (TICRATE/2)))
{
if (encoremode)
S_ChangeMusicInternal("estart", false); //S_StopMusic();
else
S_StartSound(NULL, sfx_kstart);
}
else // see also where time overs are handled - search for "lives = 2" in this file
if (leveltime >= (starttime + (TICRATE/2))) // see also where time overs are handled - search for "lives = 2" in this file
{
INT32 wantedmus = 0; // 0 is level music, 1 is invincibility, 2 is grow

7
src/s_sound.c
View file

@ -2351,12 +2351,7 @@ void S_StartEx(boolean reset)
S_StopMusic(); // Starting ambience should always be restarted, if playing.
if (leveltime < (starttime + (TICRATE/2))) // SRB2Kart
{
if (encoremode)
S_ChangeMusicEx("estart", 0, false, mapmusposition, 0, 0);
else
S_StartSound(NULL, sfx_kstart);
}
S_StartSound(NULL, encoremode ? sfx_ruby2 : sfx_kstart);
else
S_ChangeMusicEx(mapmusname, mapmusflags, true, mapmusposition, 0, 0);