From: Mario <mario@smbclan.net>
Date: Sat, 27 Oct 2018 21:13:21 +0000 (+1000)
Subject: Apply colorprefix after the name string as well, so that messages including the playe... 
X-Git-Tag: xonotic-v0.8.5~1661^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c3a146bbe49a9e35e15aeccfb9b48967640cccbc;p=xonotic%2Fxonotic-data.pk3dir.git

Apply colorprefix after the name string as well, so that messages including the player's name are consistent
---

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index d54abcb6c..41c736850 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -2745,7 +2745,7 @@ int Say(entity source, int teamsay, entity privatesay, string msgin, bool floodc
 		if(strstrofs(msgin, "/me", 0) >= 0)
 		{
 			string newmsgin = "";
-			string newnamestr = ((teamsay) ? strcat(colorstr, "(", colorprefix, namestr, colorstr, ")^7") : strcat(colorprefix, namestr));
+			string newnamestr = ((teamsay) ? strcat(colorstr, "(", colorprefix, namestr, colorstr, ")", colorprefix) : strcat(colorprefix, namestr, colorprefix));
 			FOREACH_WORD(msgin, true,
 			{
 				if(strdecolorize(it) == "/me")
@@ -2787,7 +2787,7 @@ int Say(entity source, int teamsay, entity privatesay, string msgin, bool floodc
 				//msgin = strreplace("/me", "", msgin);
 				//msgin = substring(msgin, 3, strlen(msgin));
 				//msgin = strreplace("/me", strcat(colorprefix, namestr), msgin);
-				msgstr = strcat("\{1}^4* ", "^7", msgin);
+				msgstr = strcat("\{1}^4* ^7", msgin);
 			}
 			else {
 				msgstr = "\{1}";