summaryrefslogtreecommitdiff
path: root/src/network
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2012-02-16 20:44:03 +0000
committerrubidium <rubidium@openttd.org>2012-02-16 20:44:03 +0000
commitc5f7a0f69def4f713c25efb05d8acde0956923c0 (patch)
tree51a2c83e86eb6460f0bc7998296f6fff6a04a041 /src/network
parent9941b4386e287042750588f5384a0cd188ec102b (diff)
downloadopenttd-c5f7a0f69def4f713c25efb05d8acde0956923c0.tar.xz
(svn r23957) -Fix [FS#4990]: allow sending chat to pre-active clients as the clients start accepting once they send 'map ok' to the server, which is the same moment we change their status to pre-active
Diffstat (limited to 'src/network')
-rw-r--r--src/network/network_server.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp
index 9e0c212ff..a6c87405e 100644
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -701,7 +701,7 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::SendCommand(const CommandPacke
*/
NetworkRecvStatus ServerNetworkGameSocketHandler::SendChat(NetworkAction action, ClientID client_id, bool self_send, const char *msg, int64 data)
{
- if (this->status != STATUS_ACTIVE) return NETWORK_RECV_STATUS_OKAY;
+ if (this->status < STATUS_PRE_ACTIVE) return NETWORK_RECV_STATUS_OKAY;
Packet *p = new Packet(PACKET_SERVER_CHAT);