From 5d7b2e69a6891fd5e94cf5a71d5f83ad628a578b Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Mon, 27 Sep 2010 16:23:20 +0300 Subject: [PATCH] Add menu entry for intermission art & music --- data/defaultVoretournament.cfg | 8 +++++--- data/qcsrc/client/View.qc | 1 + data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c | 4 ++++ data/qcsrc/server/g_world.qc | 1 + 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg index 62847ca1..a32c3e77 100644 --- 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" seta crosshair_hittest_blur 1 "blur the crosshair if the shot is obstructed" seta crosshair_hittest_showimpact 0 "move the crosshair to the actual impact location if obstructed" +seta cl_artwork 1 "display intermission artwork" seta cl_artwork_win 2 "number of artwork_won_ images available in the gfx folder, 0 disables winning artwork" seta cl_artwork_lose 2 "number of artwork_lost_ images available in the gfx folder, 0 disables loosing artwork" seta cl_artwork_stretch 0 "stretch artwork to fit the screen, even if it brakes image proportions" @@ -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" set g_cdtracks_dontusebydefault "" "list used by mapinfo system to automatically assign cdtracks - must be a subset of g_cdtracks_remaplist" cd remap $g_cdtracks_remaplist -set sv_intermission_cdtrack_win "win_music" -set sv_intermission_cdtrack_lose "lose_music" -set menu_cdtrack feeding_frenzy +seta sv_intermission 1 "play intermission music" +seta sv_intermission_cdtrack_win "win_music" +seta sv_intermission_cdtrack_lose "lose_music" +seta menu_cdtrack feeding_frenzy // maxidle (in seconds): kick players idle for more than that amount of time set sv_maxidle 0 diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc index 04e29f75..c9b1c7c6 100644 --- a/data/qcsrc/client/View.qc +++ b/data/qcsrc/client/View.qc @@ -492,6 +492,7 @@ void CSQC_UpdateView(float w, float h) // Draw Artwork if(intermission && !isdemo()) // the match has ended + if(cvar("cl_artwork")) if(!spectatee_status && gametype != GAME_RPG) // no one wins or loses in RPG { if(artwork_image == "") diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c index caffe537..c88136f0 100644 --- 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:")); me.TD(me, 1, 2, sl); me.TR(me); + me.TR(me); + me.TD(me, 1, 2.8, e = makeVoretCheckBox(0, "cl_artwork", "Intermission art & music")); + makeMulti(e, "sv_intermission"); + me.TR(me); me.TR(me); me.TDempty(me, 0.4); me.TD(me, 1, 2.2, e = makeVoretButton("Weapon & Crosshair settings...", '0 0 0')); diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc index ac9acf73..cd85cdea 100644 --- 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; } if(clienttype(e) == CLIENTTYPE_REAL) + if(cvar("sv_intermission")) if(!e.spectatee_status && !cvar("g_rpg")) // no one wins or loses in RPG { stuffcmd(e, "\nscr_printspeed 1000000\n"); -- 2.39.2