- make the title music only play once, unless a real demo is successf…

…ully played.
ZDoom · May 17, 2021 · e47671c · e47671c
1 parent aaf8323
commit e47671c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/d_main.cpp b/src/d_main.cpp
@@ -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 ();

diff --git a/src/g_game.cpp b/src/g_game.cpp
@@ -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;
 	}
 }