From 70a497c16a376f0dbe4603bda9bfc7131011c9c0 Mon Sep 17 00:00:00 2001 From: div0 Date: Sun, 1 Apr 2007 18:18:13 +0000 Subject: [PATCH] fix netname the right way; check for empty string in say git-svn-id: svn://svn.icculus.org/nexuiz/trunk@2280 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/cl_client.qc | 2 +- data/qcsrc/server/clientcommands.qc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index beccf2e0a..110c3d1aa 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -1348,7 +1348,7 @@ void PlayerPreThink (void) { if(strlen(self.netname) > 0) if(substring(self.netname, strlen(self.netname) - 1, 1) == "^") - self.netname = strzone(strcat(self.netname, " ")); // BROKEN COLORS can be annoying! + self.netname = strzone(strcat(substring(self.netname, 0, strlen(self.netname) - 1), " ")); // BROKEN COLORS can be annoying! // version nagging if(self.version_nagtime) diff --git a/data/qcsrc/server/clientcommands.qc b/data/qcsrc/server/clientcommands.qc index 180681016..19285f17c 100644 --- a/data/qcsrc/server/clientcommands.qc +++ b/data/qcsrc/server/clientcommands.qc @@ -11,6 +11,10 @@ void Say(entity source, float teamsay, string msgin) float flood; entity head; + if(!teamsay) + if(substring(msgin, 0, 1) == " ") + msgin = substring(msgin, 1, strlen(msgin) - 1); // work around DP say bug (say_team does not have this!) + msgin = formatmessage(msgin); if(msgin == "") @@ -38,10 +42,6 @@ void Say(entity source, float teamsay, string msgin) } */ - if(!teamsay) - if(substring(msgin, 0, 1) == " ") - msgin = substring(msgin, 1, strlen(msgin) - 1); // work around DP say bug (say_team does not have this!) - if(cvar("g_chat_teamcolors")) namestr = playername(source); else -- 2.39.2