Turn kstart into sfx

This commit is contained in:
James R 2022-02-14 15:04:30 -08:00
parent 4b1cef0f20
commit f749424de7
4 changed files with 14 additions and 2 deletions

View file

@ -805,7 +805,12 @@ void P_RestoreMusic(player_t *player)
// Event - Level Start
if (leveltime < (starttime + (TICRATE/2)))
S_ChangeMusicInternal((encoremode ? "estart" : "kstart"), false); //S_StopMusic();
{
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
{
INT32 wantedmus = 0; // 0 is level music, 1 is invincibility, 2 is grow

View file

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

View file

@ -1099,6 +1099,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"dbgsal", false, 255, 8, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // Debug notification
{"cock", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // Hammer cocks, bang bang
{"itcaps", false, 64, 16, -1, NULL, 0, -1, -1, LUMPERROR, "Item capsule"},
{"kstart", false, 64, 16, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // Sonic Adventure shwing!
// SRB2Kart - Engine sounds
// Engine class A

View file

@ -1163,6 +1163,7 @@ typedef enum
sfx_dbgsal,
sfx_cock,
sfx_itcaps,
sfx_kstart,
// Next up: UNIQUE ENGINE SOUNDS! Hoooooo boy...
// Engine class A - Low Speed, Low Weight