diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-10-03 12:40:52 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-10-03 16:47:11 -0600 |
| commit | 0269b1f766a4e9e8ded91505855cff58c18086e2 (patch) | |
| tree | c557c4c189bb536ab5ef7b8642011fe4f1da4eff /src/net/tmwserv/generalhandler.cpp | |
| parent | eb22b66b0821e49ed550d30d20d9db5af535e6a3 (diff) | |
| download | mana-client-0269b1f766a4e9e8ded91505855cff58c18086e2.tar.gz mana-client-0269b1f766a4e9e8ded91505855cff58c18086e2.tar.bz2 mana-client-0269b1f766a4e9e8ded91505855cff58c18086e2.tar.xz mana-client-0269b1f766a4e9e8ded91505855cff58c18086e2.zip | |
Do some more post-merge cleanup
Fixes a few more bugs
Diffstat (limited to 'src/net/tmwserv/generalhandler.cpp')
| -rw-r--r-- | src/net/tmwserv/generalhandler.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/net/tmwserv/generalhandler.cpp b/src/net/tmwserv/generalhandler.cpp index 0f4b5109..7948953e 100644 --- a/src/net/tmwserv/generalhandler.cpp +++ b/src/net/tmwserv/generalhandler.cpp @@ -55,7 +55,7 @@ #include <list> -Net::GeneralHandler *generalHandler; +Net::GeneralHandler *generalHandler = NULL; Net::Connection *gameServerConnection = 0; Net::Connection *chatServerConnection = 0; @@ -126,6 +126,11 @@ void GeneralHandler::load() Net::registerHandler(mTradeHandler.get()); } +void GeneralHandler::reload() +{ + // Nothing needed yet +} + void GeneralHandler::unload() { Net::clearHandlers(); |