From bc018eb7acba986b71405ab1694d13207c0c72fd Mon Sep 17 00:00:00 2001 From: Darkvater Date: Tue, 24 Oct 2006 22:19:12 +0000 Subject: (svn r6931) -Codechange: Change textmessage format a bit. Only the sender's name and target are in the sender's colour, the actual message is in white. Should improve readability. --- network.c | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) (limited to 'network.c') diff --git a/network.c b/network.c index 5742eb045..377a1681c 100644 --- a/network.c +++ b/network.c @@ -150,36 +150,27 @@ void CDECL NetworkTextMessage(NetworkAction action, uint16 color, bool self_send snprintf(message, sizeof(message), "*** %s %s", name, temp); } break; - case NETWORK_ACTION_CHAT_COMPANY: - if (self_send) { - SetDParamStr(0, name); - GetString(temp, STR_NETWORK_CHAT_TO_COMPANY, lastof(temp)); - snprintf(message, sizeof(message), "%s %s", temp, buf); - } else { - SetDParamStr(0, name); - GetString(temp, STR_NETWORK_CHAT_COMPANY, lastof(temp)); - snprintf(message, sizeof(message), "%s %s", temp, buf); - } - break; - case NETWORK_ACTION_CHAT_CLIENT: - if (self_send) { - SetDParamStr(0, name); - GetString(temp, STR_NETWORK_CHAT_TO_CLIENT, lastof(temp)); - snprintf(message, sizeof(message), "%s %s", temp, buf); - } else { - SetDParamStr(0, name); - GetString(temp, STR_NETWORK_CHAT_CLIENT, lastof(temp)); - snprintf(message, sizeof(message), "%s %s", temp, buf); - } - break; case NETWORK_ACTION_NAME_CHANGE: GetString(temp, STR_NETWORK_NAME_CHANGE, lastof(temp)); snprintf(message, sizeof(message), "*** %s %s %s", name, temp, buf); break; + case NETWORK_ACTION_CHAT_COMPANY: + SetDParamStr(0, name); + SetDParamStr(1, buf); + GetString(temp, self_send ? STR_NETWORK_CHAT_TO_COMPANY : STR_NETWORK_CHAT_COMPANY, lastof(temp)); + ttd_strlcpy(message, temp, sizeof(message)); + break; + case NETWORK_ACTION_CHAT_CLIENT: + SetDParamStr(0, name); + SetDParamStr(1, buf); + GetString(temp, self_send ? STR_NETWORK_CHAT_TO_CLIENT : STR_NETWORK_CHAT_CLIENT, lastof(temp)); + ttd_strlcpy(message, temp, sizeof(message)); + break; default: SetDParamStr(0, name); + SetDParamStr(1, buf); GetString(temp, STR_NETWORK_CHAT_ALL, lastof(temp)); - snprintf(message, sizeof(message), "%s %s", temp, buf); + ttd_strlcpy(message, temp, sizeof(message)); break; } -- cgit v1.2.3-54-g00ecf