Chat: consistently use \r for private messages

diff --git a/qcsrc/common/weapons/weapon/tuba.qc b/qcsrc/common/weapons/weapon/tuba.qc
index eb780808932fcd471d96d4727f6aa9cf6aae87a0..a3007d14aba8fe2df1b016769d2d74208fd28ba8 100644 (file)
--- a/qcsrc/common/weapons/weapon/tuba.qc
+++ b/qcsrc/common/weapons/weapon/tuba.qc
@@ -124,13 +124,13 @@ void W_Tuba_NoteOff(entity this)
                        {
                                default:
                                case 0: // Tuba
-                                       bprint(strcat("\{1}\{13}* ^3", actor.netname, "^3 played on the @!#%'n Tuba: ^7", s, "\n"));
+                                       bprint(strcat("\{1}\r* ^3", actor.netname, "^3 played on the @!#%'n Tuba: ^7", s, "\n"));
                                        break;
                                case 1:
-                                       bprint(strcat("\{1}\{13}* ^3", actor.netname, "^3 played on the @!#%'n Accordeon: ^7", s, "\n"));
+                                       bprint(strcat("\{1}\r* ^3", actor.netname, "^3 played on the @!#%'n Accordeon: ^7", s, "\n"));
                                        break;
                                case 2:
-                                       bprint(strcat("\{1}\{13}* ^3", actor.netname, "^3 played on the @!#%'n Klein Bottle: ^7", s, "\n"));
+                                       bprint(strcat("\{1}\r* ^3", actor.netname, "^3 played on the @!#%'n Klein Bottle: ^7", s, "\n"));
                                        break;
                        }
                }

diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc
index 6de4507b1708ef54516d9d5db859bdb960a37457..1e9a119cf6356c80b7dbf9adca982f5d068b3b2a 100644 (file)
--- a/qcsrc/server/command/sv_cmd.qc
+++ b/qcsrc/server/command/sv_cmd.qc
@@ -137,7 +137,7 @@ void GameCommand_adminmsg(float request, float argc)
                                        else
                                        {
                                                centerprint(client, strcat("^3", GetCallerName(NULL), ":\n^7", admin_message));
-                                               sprint(client, strcat("\{1}\{13}^3", GetCallerName(NULL), "^7: ", admin_message, "\n"));
+                                               sprint(client, strcat("\{1}\r^3", GetCallerName(NULL), "^7: ", admin_message, "\n"));
                                        }
 
                                        successful = strcat(successful, (successful ? ", " : ""), playername(client, false));

diff --git a/qcsrc/server/player.qc b/qcsrc/server/player.qc
index 06bdb1428f869439244afd76f9e836eef8000945..d7679877eb00dd3e6e9ca5a59c77660f0584722c 100644 (file)
--- a/qcsrc/server/player.qc
+++ b/qcsrc/server/player.qc
@@ -795,11 +795,11 @@ int Say(entity source, int teamsay, entity privatesay, string msgin, bool floodc
        } else {
                if(privatesay)
                {
-                       msgstr = strcat("\{1}\{13}* ", colorprefix, namestr, "^3 tells you: ^7");
+                       msgstr = strcat("\{1}\r* ", colorprefix, namestr, "^3 tells you: ^7");
                        privatemsgprefixlen = strlen(msgstr);
                        msgstr = strcat(msgstr, msgin);
                        cmsgstr = strcat(colorstr, colorprefix, namestr, "^3 tells you:\n^7", msgin);
-                       privatemsgprefix = strcat("\{1}\{13}* ^3You tell ", playername(privatesay, autocvar_g_chat_teamcolors), ": ^7");
+                       privatemsgprefix = strcat("\{1}\r* ^3You tell ", playername(privatesay, autocvar_g_chat_teamcolors), ": ^7");
                }
                else if(teamsay)
                {
@@ -808,10 +808,10 @@ 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(colorstr, "(", colorprefix, namestr, colorstr, ")^7"), msgin);
-                               msgstr = strcat("\{1}\{13}^4* ", "^7", msgin);
+                               msgstr = strcat("\{1}\r^4* ", "^7", msgin);
                        }
                        else
-                               msgstr = strcat("\{1}\{13}", colorstr, "(", colorprefix, namestr, colorstr, ") ^7", msgin);
+                               msgstr = strcat("\{1}\r", colorstr, "(", colorprefix, namestr, colorstr, ") ^7", msgin);
                        cmsgstr = strcat(colorstr, "(", colorprefix, namestr, colorstr, ")\n^7", msgin);
                }
                else