From c3a146bbe49a9e35e15aeccfb9b48967640cccbc Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 28 Oct 2018 07:13:21 +1000 Subject: [PATCH] Apply colorprefix after the name string as well, so that messages including the player's name are consistent --- qcsrc/server/client.qc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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}"; -- 2.39.2