summaryrefslogtreecommitdiff
path: root/src/net/eathena/messagehandler.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-09-02 03:12:14 +0300
committerAndrei Karas <akaras@inbox.ru>2015-09-02 03:12:14 +0300
commit40730c4fa73d403cf7284a76d9b26f7ec662afa4 (patch)
tree3bf9dce3ca6297a06193cdcc19cfdfa914fc48b2 /src/net/eathena/messagehandler.cpp
parentab8c8cdae07d96cb18276a95b41ddb856c864958 (diff)
downloadmv-40730c4fa73d403cf7284a76d9b26f7ec662afa4.tar.gz
mv-40730c4fa73d403cf7284a76d9b26f7ec662afa4.tar.bz2
mv-40730c4fa73d403cf7284a76d9b26f7ec662afa4.tar.xz
mv-40730c4fa73d403cf7284a76d9b26f7ec662afa4.zip
Remove mNetwork field from MessageHandlers
Diffstat (limited to 'src/net/eathena/messagehandler.cpp')
-rw-r--r--src/net/eathena/messagehandler.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/net/eathena/messagehandler.cpp b/src/net/eathena/messagehandler.cpp
index bdfbe49e6..f8490ed1d 100644
--- a/src/net/eathena/messagehandler.cpp
+++ b/src/net/eathena/messagehandler.cpp
@@ -32,21 +32,19 @@ namespace EAthena
{
MessageHandler::MessageHandler() :
- Net::MessageHandler(),
- mNetwork(nullptr)
+ Net::MessageHandler()
{
}
MessageHandler::~MessageHandler()
{
- if (mNetwork)
- mNetwork->unregisterHandler(this);
+ if (Network::mInstance)
+ Network::mInstance->unregisterHandler(this);
}
void MessageHandler::setNetwork(Network *const network)
{
- assert(!(network && mNetwork));
- mNetwork = network;
+ assert(!(network && Network::mInstance));
}
} // namespace EAthena