summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2012-02-07 01:30:31 +0100
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-02-12 21:03:36 +0100
commit56490c86949135687e1ab0dd43d605c653f26c45 (patch)
tree77b0b19099ae0b8eb04646b62df5a35cd6c2be72 /src/net
parent137ade7226af37d073a5755b90181275664dd65c (diff)
downloadmana-56490c86949135687e1ab0dd43d605c653f26c45.tar.gz
mana-56490c86949135687e1ab0dd43d605c653f26c45.tar.bz2
mana-56490c86949135687e1ab0dd43d605c653f26c45.tar.xz
mana-56490c86949135687e1ab0dd43d605c653f26c45.zip
Restored manaserv-less builds
I made sure the manaserv based custom server don't get deleted when running a manaserv-less client session. Reviewed-by: Thorbjørn Lindeijer
Diffstat (limited to 'src/net')
-rw-r--r--src/net/net.cpp2
-rw-r--r--src/net/serverinfo.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/net/net.cpp b/src/net/net.cpp
index 160feed2..4b28f567 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -154,9 +154,11 @@ void connectToServer(ServerInfo &server)
switch (server.type)
{
+#ifdef ENABLE_MANASERV
case ServerInfo::MANASERV:
new ManaServ::GeneralHandler;
break;
+#endif
case ServerInfo::TMWATHENA:
new TmwAthena::GeneralHandler;
break;
diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h
index 0748430f..e709bed0 100644
--- a/src/net/serverinfo.h
+++ b/src/net/serverinfo.h
@@ -106,7 +106,6 @@ public:
return TMWATHENA;
else if (compareStrI(type, "manaserv") == 0)
return MANASERV;
-
return UNKNOWN;
}
};