Add menu entry for intermission art & music

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index 62847ca189fcd85fee1726c119d3017f3864506c..a32c3e77ad2d9e2a0bd29006c280e6354c040c1a 100644 (file)
--- a/data/defaultVoretournament.cfg
+++ b/data/defaultVoretournament.cfg
@@ -113,6 +113,7 @@ seta crosshair_effect_scalefade 1 "use scaling and fading for crosshair effects"
 seta crosshair_hittest 1.25 "do a crosshair hit evaluation; also, the crosshair is scaled by the given number when aiming at an enemy, and blurred when aiming at a team mate"\r
 seta crosshair_hittest_blur 1 "blur the crosshair if the shot is obstructed"\r
 seta crosshair_hittest_showimpact 0 "move the crosshair to the actual impact location if obstructed"\r
+seta cl_artwork 1 "display intermission artwork"\r
 seta cl_artwork_win 2 "number of artwork_won_ images available in the gfx folder, 0 disables winning artwork"\r
 seta cl_artwork_lose 2 "number of artwork_lost_ images available in the gfx folder, 0 disables loosing artwork"\r
 seta cl_artwork_stretch 0 "stretch artwork to fit the screen, even if it brakes image proportions"\r
@@ -1225,9 +1226,10 @@ set sv_foginterval 0
 set g_cdtracks_remaplist "feeding_frenzy digital-pursuit brokenlight ninesix sixtyfour_revisited infiltrator stone_fortress high_tech_lab space_walk meltdown inner-peace out-there variable quiet boss_theme ghost-town" "list used by mapinfo system to automatically assign cdtracks - must match the cd remap command"\r
 set g_cdtracks_dontusebydefault "" "list used by mapinfo system to automatically assign cdtracks - must be a subset of g_cdtracks_remaplist"\r
 cd remap $g_cdtracks_remaplist\r
-set sv_intermission_cdtrack_win "win_music"\r
-set sv_intermission_cdtrack_lose "lose_music"\r
-set menu_cdtrack feeding_frenzy\r
+seta sv_intermission 1 "play intermission music"\r
+seta sv_intermission_cdtrack_win "win_music"\r
+seta sv_intermission_cdtrack_lose "lose_music"\r
+seta menu_cdtrack feeding_frenzy\r
 \r
 // maxidle (in seconds): kick players idle for more than that amount of time\r
 set sv_maxidle 0\r

diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index 04e29f75222dc61747095245d5f40405063f0c8b..c9b1c7c65f03044e73713998b5b04cec212b97e9 100644 (file)
--- a/data/qcsrc/client/View.qc
+++ b/data/qcsrc/client/View.qc
@@ -492,6 +492,7 @@ void CSQC_UpdateView(float w, float h)
 \r
        // Draw Artwork\r
        if(intermission && !isdemo()) // the match has ended\r
+       if(cvar("cl_artwork"))\r
        if(!spectatee_status && gametype != GAME_RPG) // no one wins or loses in RPG\r
        {\r
                if(artwork_image == "")\r

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c
index caffe5378dd8d442e9f8eb082e06c1ce3e9a0299..c88136f0f798e1a7d54c03aaf7f7196303276965 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c
+++ b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c
@@ -106,6 +106,10 @@ void fillVoretPlayerSettingsTab(entity me)
                me.TD(me, 1, 1, e = makeVoretSliderCheckBox(-1, 1, sl, "Zoom speed:"));\r
                me.TD(me, 1, 2, sl);\r
        me.TR(me);\r
+       me.TR(me);\r
+               me.TD(me, 1, 2.8, e = makeVoretCheckBox(0, "cl_artwork", "Intermission art & music"));\r
+               makeMulti(e, "sv_intermission");\r
+       me.TR(me);\r
        me.TR(me);\r
                me.TDempty(me, 0.4);\r
                me.TD(me, 1, 2.2, e = makeVoretButton("Weapon & Crosshair settings...", '0 0 0'));\r

diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc
index ac9acf73d2defbc4d01121ef08eb4572a3c6016a..cd85cdea5b1611b0947c4c296f7162099cced67b 100644 (file)
--- a/data/qcsrc/server/g_world.qc
+++ b/data/qcsrc/server/g_world.qc
@@ -1351,6 +1351,7 @@ void FixIntermissionClient(entity e)
                                e.weaponentity.weaponentity.effects = EF_NODRAW;\r
                }\r
                if(clienttype(e) == CLIENTTYPE_REAL)\r
+               if(cvar("sv_intermission"))\r
                if(!e.spectatee_status && !cvar("g_rpg")) // no one wins or loses in RPG\r
                {\r
                        stuffcmd(e, "\nscr_printspeed 1000000\n");\r