From 6d2ac151b91d0acd677d29f459b9110b96123576 Mon Sep 17 00:00:00 2001 From: yamamama Date: Wed, 17 Dec 2025 18:55:38 -0500 Subject: [PATCH] Grand Prix start jingle --- src/p_tick.c | 3 ++- src/s_sound.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/p_tick.c b/src/p_tick.c index 310be705b..f35600ca8 100644 --- a/src/p_tick.c +++ b/src/p_tick.c @@ -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. diff --git a/src/s_sound.c b/src/s_sound.c index cf3bb8fdf..9dd4e5046 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -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;