Implemented end jingles

diff --git a/qcsrc/client/hud/panel/infomessages.qc b/qcsrc/client/hud/panel/infomessages.qc
index a5322f93bdf6bcb0b74a7a5fc1348849a848c3e2..3cafc9f28025a56bce0c5e730954c467ab8e4e79 100644 (file)
--- a/qcsrc/client/hud/panel/infomessages.qc
+++ b/qcsrc/client/hud/panel/infomessages.qc
@@ -123,8 +123,8 @@ void HUD_InfoMessages()
                        }
 
                        //bool mutator_returnvalue = MUTATOR_CALLHOOK(DrawInfoMessages, pos, mySize, img_curr_group);
-                       pos = M_ARGV(0, vector);
-                       img_curr_group = M_ARGV(2, int);
+                       //pos = M_ARGV(0, vector);
+                       //img_curr_group = M_ARGV(2, int);
 
                        //if(!mutator_returnvalue)
                        //{

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index e153fdd5fb90e273702d3162d42b5e352741b229..e96c67b47bad3546bad0f461756d2765297e54ca 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -124,9 +124,14 @@ bool autocvar_g_chat_teamcolors;
 bool autocvar_g_chat_tellprivacy;
 bool autocvar_g_forced_respawn;
 string autocvar_g_forced_team_otherwise; // TODO: Move to teamplay.qc
+
 bool autocvar_g_chat_sounds; // z411
 string autocvar_g_chat_sounds_list; // z411
 float autocvar_g_chat_sounds_flood; // z411
+bool autocvar_g_jingle_end; // z411
+string autocvar_g_jingle_end_list; // z411
+float autocvar_g_jingle_end_volume; // z411
+
 #define autocvar_g_friendlyfire cvar("g_friendlyfire")
 #define autocvar_g_friendlyfire_virtual cvar("g_friendlyfire_virtual")
 #define autocvar_g_friendlyfire_virtual_force cvar("g_friendlyfire_virtual_force")

diff --git a/qcsrc/server/world.qc b/qcsrc/server/world.qc
index 82ec1f3acb37005099a84916b4d7c9267d3b849b..25163269bfc832479cfd8fa1536cab49f9473e8f 100644 (file)
--- a/qcsrc/server/world.qc
+++ b/qcsrc/server/world.qc
@@ -1621,6 +1621,29 @@ void NextLevel()
        });
 
        target_music_kill();
+       
+       // z411
+       if(autocvar_g_jingle_end) {
+               int jingles_len = 0;
+               string jingles[32];
+               jingles[0] = "";
+               
+               FOREACH_WORD(autocvar_g_jingle_end_list, it,
+               {
+                       jingles[jingles_len] = it;
+                       jingles_len++;
+               });
+               
+               if(jingles_len) {
+                       int song_to_play = rint(random() * (jingles_len - 1));
+               
+                       FOREACH_CLIENT(IS_REAL_CLIENT(it),
+                       {
+                               stuffcmd(it, "cd stop\n");
+                               _sound(it, CH_INFO, strcat("jingle/", jingles[song_to_play], ".ogg"), VOL_BASE * autocvar_g_jingle_end_volume, ATTEN_NORM);
+                       });
+               }
+       }
 
        if(autocvar_g_campaign)
                CampaignPreIntermission();