incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Grand Prix start jingle

Browse source
This commit is contained in:
yamamama 2025-12-17 18:55:38 -05:00
parent 0b8396adc8
commit 6d2ac151b9
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/p_tick.c
View file

@ -44,6 +44,7 @@
#include "k_bot.h" // K_BotTicker
#include "k_items.h" // ItemBGone
#include "k_specialstage.h"
#include "k_grandprix.h"
#ifdef PARANOIA
#include "deh_tables.h" // MOBJTYPE_LIST
@ -852,7 +853,7 @@ void P_Ticker(boolean run)
{
tic_t startingtime = (gametyperules & GTR_NOCOUNTDOWN) ? introtime : starttime;
if (leveltime < startingtime) // SRB2Kart
S_ChangeMusicInternal((encoremode ? "estart" : "kstart"), false); // yes this will be spammed otherwise encore and some stuff WILL overwrite it
S_ChangeMusicInternal(((grandprixinfo.roundnum > 0) ? "gpstrt" : (encoremode ? "estart" : "kstart")), false); // yes this will be spammed otherwise encore and some stuff WILL overwrite it
else if (leveltime == startingtime) // The GO! sound stops the level start ambience
S_StopMusic();
else if (leveltime == startingtime + (TICRATE/2)) // Plays the music after the starting countdown.

3
src/s_sound.c
View file

@ -35,6 +35,7 @@
#include "byteptr.h"
#include "v_video.h"
#include "m_menu.h" // M_ChangeMenuMusic
#include "k_grandprix.h" // grandprixinfo
#ifdef HW3SOUND
// 3D Sound Interface
@ -2668,7 +2669,7 @@ void S_InitLevelMusic(boolean fromnetsave)
S_StopMusic(); // Starting ambience should always be restarted, if playing.
S_ChangeMusicEx((encoremode ? "estart" : "kstart"), 0, false, mapmusposition, 0, 0);
S_ChangeMusicEx(((grandprixinfo.roundnum > 0) ? "gpstrt" : (encoremode ? "estart" : "kstart")), 0, false, mapmusposition, 0, 0);
S_ResetMusicStack();
music_stack_noposition = false;