From 09d4b97ae2bee029496c92fe57a3a02a04d9730a Mon Sep 17 00:00:00 2001 From: div0 Date: Fri, 28 Jul 2006 11:22:05 +0000 Subject: [PATCH] centerteamsay (say_team is also displayed as centerprint) - hopefully fixes teamplay issues in CTF :P Better solution would still be two independent areas for say and "normal" messages git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@1782 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/clientcommands.qc | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/data/qcsrc/server/clientcommands.qc b/data/qcsrc/server/clientcommands.qc index f7bfd9355..88fef0ddd 100644 --- a/data/qcsrc/server/clientcommands.qc +++ b/data/qcsrc/server/clientcommands.qc @@ -3,7 +3,7 @@ float ValidateMap(string vote); void Say(entity source, float teamsay, string msgin) { - string msgstr, colorstr; + string msgstr, colorstr, cmsgstr; entity head; msgin = formatmessage(msgin); @@ -37,9 +37,12 @@ void Say(entity source, float teamsay, string msgin) } if(teamsay) - msgstr = strcat(colorstr, "(^3", source.netname, colorstr, ") ^7", msgin, "\n"); + { + msgstr = strzone(strcat(colorstr, "(^3", source.netname, colorstr, ") ^7", msgin, "\n")); + cmsgstr = strcat(colorstr, "(^3", source.netname, colorstr, ")\n^7", wordwrap(msgin, 50)); + } else - msgstr = strcat("^3", source.netname, "^7: ", msgin, "\n"); + msgstr = strzone(strcat("^3", source.netname, "^7: ", msgin, "\n")); head = find(world, classname, "player"); while(head) @@ -48,6 +51,8 @@ void Say(entity source, float teamsay, string msgin) if(!teamsay || (head.team == source.team)) { sprint(head, msgstr); + if(teamsay) + centerprint(head, cmsgstr); stuffcmd(head, "play2 misc/talk.wav\n"); } head = find(head, classname, "player"); @@ -77,6 +82,8 @@ void Say(entity source, float teamsay, string msgin) } ServerConsoleEcho(substring(msgstr, 0, strlen(msgstr) - 1), TRUE); } + + strunzone(msgstr); } void SV_ParseClientCommand(string s) { -- 2.39.2