vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Title demos don't interrupt the music

This commit is contained in:
TehRealSalt 2018-11-13 21:01:59 -05:00
parent 5a06ae76ea
commit 1ab5ac58a7
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/f_finale.c
View File

@ -897,7 +897,9 @@ void F_StartTitleScreen(void)
// IWAD dependent stuff. // IWAD dependent stuff.
// music is started in the ticker // music is started in the ticker
S_StopMusic(); if (!fromtitledemo) // SRB2Kart: Don't reset music if the right track is already playing
S_StopMusic();
fromtitledemo = false;
animtimer = 0; animtimer = 0;
@ -1065,7 +1067,7 @@ void F_TitleScreenTicker(boolean run)
return; return;
}*/ }*/
titledemo = true; titledemo = fromtitledemo = true;
G_DoPlayDemo(dname); G_DoPlayDemo(dname);
} }
} }

1
src/g_game.c
View File

@ -286,6 +286,7 @@ static char demoname[64];
boolean demorecording; boolean demorecording;
boolean demoplayback; boolean demoplayback;
boolean titledemo; // Title Screen demo can be cancelled by any key boolean titledemo; // Title Screen demo can be cancelled by any key
boolean fromtitledemo; // SRB2Kart: Don't stop the music
static UINT8 *demobuffer = NULL; static UINT8 *demobuffer = NULL;
static UINT8 *demo_p, *demotime_p; static UINT8 *demo_p, *demotime_p;
static UINT8 *demoend; static UINT8 *demoend;

2
src/g_game.h
View File

@ -36,7 +36,7 @@ extern boolean playeringame[MAXPLAYERS];
// ====================================== // ======================================
// demoplaying back and demo recording // demoplaying back and demo recording
extern boolean demoplayback, titledemo, demorecording, timingdemo; extern boolean demoplayback, titledemo, fromtitledemo, demorecording, timingdemo;
// Quit after playing a demo from cmdline. // Quit after playing a demo from cmdline.
extern boolean singledemo; extern boolean singledemo;

6
src/s_sound.c
View File

@ -1683,7 +1683,8 @@ void S_ChangeMusic(const char *mmusic, UINT16 mflags, boolean looping)
S_ClearSfx(); S_ClearSfx();
#endif #endif
if (S_MusicDisabled()) if (S_MusicDisabled()
|| titledemo) // SRB2Kart: Demos don't interrupt title screen music
return; return;
// No Music (empty string) // No Music (empty string)
@ -1717,7 +1718,8 @@ void S_ChangeMusic(const char *mmusic, UINT16 mflags, boolean looping)
void S_StopMusic(void) void S_StopMusic(void)
{ {
if (!I_SongPlaying()) if (!I_SongPlaying()
|| titledemo) // SRB2Kart: Demos don't interrupt title screen music
return; return;
if (I_SongPaused()) if (I_SongPaused())

4
src/sounds.c
View File

@ -412,10 +412,10 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s3k3f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k3f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k40", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k40", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k41", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k41", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k42", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k42", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Kart Thunder Shield spawned
{"s3k43", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k43", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k44", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k44", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k45", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Kart Thunder Shield use {"s3k45", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k46", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k46", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},
{"s3k47", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Kart AIZ dust {"s3k47", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, // Kart AIZ dust
{"s3k48", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR}, {"s3k48", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR},