Tally: Fix intermission music being played on rounds without intermissions

src/k_tally.cpp

@@ -1426,6 +1426,8 @@ void K_TickPlayerTally(player_t *player)
 		while (player->tally.state != TALLY_ST_DONE && player->tally.state != TALLY_ST_GAMEOVER_DONE);
 
 		player->tally.delay = std::min(player->tally.delay, TICRATE);
+		
+		if (Y_ShouldDoIntermission())
 			musiccountdown = 2; // gets decremented to 1 in G_Ticker to immediately trigger intermission music [blows raspberry]
 	}
 	else

src/y_inter.cpp

@@ -1937,12 +1937,7 @@ void Y_Ticker(void)
 	}
 }
 
-//
+boolean Y_ShouldDoIntermission(void)
-// Y_DetermineIntermissionType
-//
-// Determines the intermission type from the current gametype.
-//
-void Y_DetermineIntermissionType(void)
 {
 	// no intermission for GP events
 	if ((grandprixinfo.gp == true && grandprixinfo.eventmode != GPEVENT_NONE)
@@ -1954,6 +1949,21 @@ void Y_DetermineIntermissionType(void)
 	|| (nextmapoverride == NEXTMAP_TUTORIALCHALLENGE+1 || tutorialchallenge != TUTORIALSKIP_NONE)
 	// or title screen attract demos
 	|| (demo.playback && demo.attract == DEMO_ATTRACT_TITLE))
+	{
+		return false;
+	}
+	return true;
+}
+
+//
+// Y_DetermineIntermissionType
+//
+// Determines the intermission type from the current gametype.
+//
+void Y_DetermineIntermissionType(void)
+{
+	// no intermission for GP events
+	if (!Y_ShouldDoIntermission())
 	{
 		intertype = int_none;
 		return;

src/y_inter.h

@@ -59,6 +59,7 @@ void Y_DrawIntermissionButton(INT32 startslide, INT32 through);
 void Y_StartIntermission(void);
 void Y_EndIntermission(void);
 
+boolean Y_ShouldDoIntermission(void);
 void Y_DetermineIntermissionType(void);
 
 void Y_PlayIntermissionMusic(void);