Fix crashes/issues with non-broadcast network chat.

This commit is contained in:
Jonathan G Rennison
2017-05-01 14:50:45 +01:00
parent 9c74da46b1
commit e43f0dad21
2 changed files with 4 additions and 2 deletions

View File

@@ -272,6 +272,7 @@ void NetworkDrawChatMessage()
static void SendChat(const char *buf, DestType type, int dest)
{
if (StrEmpty(buf)) return;
assert(type >= DESTTYPE_BROADCAST && type <= DESTTYPE_CLIENT);
if (!_network_server) {
MyClient::SendChat((NetworkAction)(NETWORK_ACTION_CHAT + type), type, dest, buf, NetworkTextMessageData());
} else {
@@ -303,7 +304,8 @@ struct NetworkChatWindow : public Window {
static const StringID chat_captions[] = {
STR_NETWORK_CHAT_ALL_CAPTION,
STR_NETWORK_CHAT_COMPANY_CAPTION,
STR_NETWORK_CHAT_CLIENT_CAPTION
STR_NETWORK_CHAT_CLIENT_CAPTION,
STR_NULL,
};
assert((uint)this->dtype < lengthof(chat_captions));
this->dest_string = chat_captions[this->dtype];