diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-02-01 21:12:41 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-02-01 21:12:41 +0100 |
| commit | 852de0424f7226dfd61d2779c1ea6413ac85d584 (patch) | |
| tree | e902d1e91d760273cb1b1fba4c51cf3232ed6194 /src/net | |
| parent | f19b3786f3f000a84c8080594e398686e0298ca4 (diff) | |
| parent | bcd1d9aff41b5c152cafade7532242c94ac1f710 (diff) | |
| download | mana-852de0424f7226dfd61d2779c1ea6413ac85d584.tar.gz mana-852de0424f7226dfd61d2779c1ea6413ac85d584.tar.bz2 mana-852de0424f7226dfd61d2779c1ea6413ac85d584.tar.xz mana-852de0424f7226dfd61d2779c1ea6413ac85d584.zip | |
Merge branch '0.5'
Conflicts:
po/de.po
src/game.cpp
src/resources/wallpaper.cpp
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/net.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/net/net.cpp b/src/net/net.cpp index 09f245b0..090ecd78 100644 --- a/src/net/net.cpp +++ b/src/net/net.cpp @@ -154,10 +154,11 @@ void connectToServer(ServerInfo &server) switch (server.type) { +#ifdef MANASERV_SUPPORT case ServerInfo::MANASERV: new ManaServ::GeneralHandler; break; - +#endif case ServerInfo::TMWATHENA: new TmwAthena::GeneralHandler; break; |