diff options
author | Andrei Karas <akaras@inbox.ru> | 2011-11-08 00:44:17 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2011-11-08 00:44:17 +0300 |
commit | 4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe (patch) | |
tree | 714897eca03fbcb764f5b450a29cc1aef8d33433 /src/net/tmwa/npchandler.cpp | |
parent | 9e83411f7e4147d09af5a5006888dcc187ea0ef8 (diff) | |
download | manaplus-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.gz manaplus-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.bz2 manaplus-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.xz manaplus-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.zip |
Fix more gcc 4.7 warnings.
Diffstat (limited to 'src/net/tmwa/npchandler.cpp')
-rw-r--r-- | src/net/tmwa/npchandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp index 1c2654087..6b6ffcbb6 100644 --- a/src/net/tmwa/npchandler.cpp +++ b/src/net/tmwa/npchandler.cpp @@ -92,7 +92,7 @@ void NpcHandler::handleMessage(Net::MessageIn &msg) break; } - mDialog = 0; + mDialog = nullptr; } void NpcHandler::talk(int npcId) @@ -195,7 +195,7 @@ int NpcHandler::getNpc(Net::MessageIn &msg, bool haveLength) const int npcId = msg.readInt32(); NpcDialogs::const_iterator diag = mNpcDialogs.find(npcId); - mDialog = 0; + mDialog = nullptr; if (diag == mNpcDialogs.end()) { |