summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2010-04-19 19:50:56 +0000
committerrubidium <rubidium@openttd.org>2010-04-19 19:50:56 +0000
commitdf4d8b3bc9f52496b95ed1f5865ee31de1b07590 (patch)
treea7ac1908f4b566d18db48721e6b089f7dde32e74
parent1ce5d3ed12553919900d2b1378703f2f6462a8bf (diff)
downloadopenttd-df4d8b3bc9f52496b95ed1f5865ee31de1b07590.tar.xz
(svn r19678) -Fix (r19607): client status was shown incorrect in the console
-rw-r--r--src/network/core/tcp_game.h1
-rw-r--r--src/network/network_server.cpp4
2 files changed, 4 insertions, 1 deletions
diff --git a/src/network/core/tcp_game.h b/src/network/core/tcp_game.h
index 9fefc3667..5fb58aa65 100644
--- a/src/network/core/tcp_game.h
+++ b/src/network/core/tcp_game.h
@@ -85,6 +85,7 @@ enum ClientStatus {
STATUS_DONE_MAP, ///< The client has downloaded the map
STATUS_PRE_ACTIVE, ///< The client is catching up the delayed frames
STATUS_ACTIVE, ///< The client is active within in the game
+ STATUS_END ///< Must ALWAYS be on the end of this list!! (period)
};
class NetworkClientSocket;
diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp
index b717395a7..bdb7642bf 100644
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -1703,7 +1703,8 @@ void NetworkServerShowStatusToConsole()
{
static const char * const stat_str[] = {
"inactive",
- "authorizing",
+ "authorizing (server password)",
+ "authorizing (company password)",
"authorized",
"waiting",
"loading map",
@@ -1711,6 +1712,7 @@ void NetworkServerShowStatusToConsole()
"ready",
"active"
};
+ assert_compile(lengthof(stat_str) == STATUS_END);
NetworkClientSocket *cs;
FOR_ALL_CLIENT_SOCKETS(cs) {