Merge branch 'master' into Mario/minigames_merge

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / cl_player.qc

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 059d754bb7a7d9ba3f0e058aeda97e96ad65c08f..3f10caa8d769152866575ce6eb9824de0327ebf8 100644 (file)
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -19,6 +19,8 @@
 #include "../common/playerstats.qh"
 #include "../csqcmodellib/sv_model.qh"
 
+#include "../common/minigames/sv_minigames.qh"
+
 #include "weapons/weaponstats.qh"
 
 void CopyBody_Think(void)
@@ -876,6 +878,15 @@ float Say(entity source, float teamsay, entity privatesay, string msgin, float f
                        if(cmsgstr != "")
                                centerprint(privatesay, cmsgstr);
                }
+               else if ( teamsay && source.active_minigame )
+               {
+                       sprint(source, sourcemsgstr);
+                       dedicated_print(msgstr); // send to server console too
+                       FOR_EACH_REALCLIENT(head) 
+                               if(head != source)
+                               if(head.active_minigame == source.active_minigame)
+                                       sprint(head, msgstr);
+               }
                else if(teamsay > 0) // team message, only sent to team mates
                {
                        sprint(source, sourcemsgstr);