summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorStefan Dombrowski <stefan@uni-bonn.de>2010-10-13 13:19:40 +0200
committerStefan Dombrowski <stefan@uni-bonn.de>2010-10-13 13:19:40 +0200
commitf9ca4759d3dab9515bc3c1cb9b7e2bac97d1f71f (patch)
treec9eb60e198e72813e3aa946cb4ca9d7468b667ff /src/net
parent10d32e687d49e69dbf7ee9cff9a2e52a832326ab (diff)
downloadmana-client-f9ca4759d3dab9515bc3c1cb9b7e2bac97d1f71f.tar.gz
mana-client-f9ca4759d3dab9515bc3c1cb9b7e2bac97d1f71f.tar.bz2
mana-client-f9ca4759d3dab9515bc3c1cb9b7e2bac97d1f71f.tar.xz
mana-client-f9ca4759d3dab9515bc3c1cb9b7e2bac97d1f71f.zip
Hiding Manaserv from the player on TMW-Athena only release
With the preprocessor definition MANASERV_SUPPORT the manaserv support is avaible as before. * Removing server type from server dialog GUI. * Ignoring Manaserv entries in serverlist.xml. * In order not to lose Manaserv CustomServers from the config.xml, they get stored in mManaservServers. * The entries in mManaservServers are saved in config.xml again. But they are now behind the TMWA-Athena servers. * For custom server the GUI sets 6901 as default value for port. * If the server type is unknown, then we use TMW-Athena. This is relevant, if the client is started with command line options for server. Reviewed-by: Bertram
Diffstat (limited to 'src/net')
-rw-r--r--src/net/net.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/net/net.cpp b/src/net/net.cpp
index 7e7395a6..25dcd981 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -134,12 +134,16 @@ void connectToServer(ServerInfo &server)
// TODO: Query the server about itself and choose the netcode based on
// that
+#ifndef MANASERV_SUPPORT
+ server.type = ServerInfo::TMWATHENA;
+#else
if (server.port == 6901)
server.type = ServerInfo::TMWATHENA;
else if (server.port == 9601)
server.type = ServerInfo::MANASERV;
else
logger->error(_("Unknown Server Type! Exiting."));
+#endif
}
if (networkType == server.type && getGeneralHandler() != NULL)