From 70e3d610060cffeeb4a6edbbf7641dd4be61fe31 Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Sat, 27 Dec 2014 17:11:12 -0600 Subject: [PATCH] Fix cg.intermissionStarted only being enabled at first intermission Game sets CS_INTERMISSION to 1 at intermission, but does not clear it at map_restart so it's only sent the first time. CG_MapRestart manually clears cg.intermissionStarted (which is set to value of CS_INTERMISSION when it's modified). So subsequent intermissions do not have cg.intermissionStarted enabled. Now CS_INTERMISSION is cleared and sent each time intermission is started and cg.intermissionStarted is enabled each time. This makes subsequent intermissions not play sounds in CG_CheckLocalSounds during the 1 second between intermission starting and switching to scoreboard (PM_INTERMISSION) and makes Team Arena voice chats not play. --- code/game/g_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/g_main.c b/code/game/g_main.c index 3d22ba0e..e3903bff 100644 --- a/code/game/g_main.c +++ b/code/game/g_main.c @@ -506,6 +506,7 @@ void G_InitGame( int levelTime, int randomSeed, int restart ) { G_RemapTeamShaders(); + trap_SetConfigstring( CS_INTERMISSION, "" ); }