- if (!menuNotTheFirstFrame)
- {
- menuNotTheFirstFrame = true;
- if (Menu_Active && !cvar("menu_video_played"))
- {
- localcmd("cd loop $menu_cdtrack\n");
- // TODO: use this when we have a welcome sound
- //localcmd("cd loop $menu_cdtrack; play sound/announcer/default/welcome.wav\n");
- menuLogoAlpha = -0.8; // no idea why, but when I start this at zero, it jumps instead of fading FIXME
- }
- // ALWAYS set this cvar; if we start but menu is not active, this means we want no background music!
- localcmd("set menu_video_played 1\n");
+
+ if (menuNotTheFirstFrame == 0) // only fade the menu in once ever
+ menuLogoAlpha = -0.8; // no idea why, but when I start this at zero, it jumps instead of fading FIXME
+
+ if (menuNotTheFirstFrame <= 1) // only once per menu reload
+ {
+ if (Menu_Active && !autocvar_menu_no_music_nor_welcome)
+ {
+ localcmd("cd loop $menu_cdtrack\n");
+
+ // TODO: enable this when we have a welcome sound
+ // FIXME: change the file used according to the selected announcer
+ // Only play the welcome announcement once, not on any menu reloads
+ //if (menuNotTheFirstFrame == 0)
+ //localcmd("play sound/announcer/default/welcome.wav\n");
+ }
+
+ menuNotTheFirstFrame = 2;