zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-27 14:32:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- make the title music only play once, unless a real demo is successfully played.

Browse source
This commit is contained in:
Christoph Oelckers 2021-05-17 11:41:43 +02:00
parent aaf8323eb2
commit e47671c865
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/d_main.cpp
View file

@ -315,6 +315,7 @@ FStartupInfo GameStartupInfo;
FString lastIWAD;
int restart = 0;
bool AppActive = true;
bool playedtitlemusic;
cycle_t FrameCycles;
@ -1573,7 +1574,8 @@ void D_DoAdvanceDemo (void)
gamestate = GS_DEMOSCREEN;
pagename = gameinfo.TitlePage;
pagetic = (int)(gameinfo.titleTime * TICRATE);
S_ChangeMusic (gameinfo.titleMusic, gameinfo.titleOrder, false);
if (!playedtitlemusic) S_ChangeMusic (gameinfo.titleMusic, gameinfo.titleOrder, false);
playedtitlemusic = true;
demosequence = 3;
pagecount = 0;
C_HideConsole ();

4
src/g_game.cpp
View file

@ -138,6 +138,7 @@ CUSTOM_CVAR (Int, displaynametags, 0, CVAR_ARCHIVE)
CVAR(Int, nametagcolor, CR_GOLD, CVAR_ARCHIVE)
extern bool playedtitlemusic;
gameaction_t gameaction;
gamestate_t gamestate = GS_STARTUP;
@ -1166,7 +1167,7 @@ void G_Ticker ()
case ga_loadgameplaydemo:
G_DoLoadGame ();
// fallthrough
case ga_playdemo:
case ga_playdemo:
G_DoPlayDemo ();
break;
case ga_completed:
@ -2934,6 +2935,7 @@ void G_DoPlayDemo (void)
usergame = false;
demoplayback = true;
playedtitlemusic = false;
}
}