diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-01-21 01:26:07 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-01-21 01:26:07 +0300 |
| commit | 98dabed4de60bc86522632379f2499aecbae2b70 (patch) | |
| tree | 48924b90447eb513f330c1e82d9afbab3719525e /src/net/tmwa | |
| parent | ec6db5f3d8b7f0b725fec0b4d8d71b330aa034c6 (diff) | |
| download | manaplus-98dabed4de60bc86522632379f2499aecbae2b70.tar.gz manaplus-98dabed4de60bc86522632379f2499aecbae2b70.tar.bz2 manaplus-98dabed4de60bc86522632379f2499aecbae2b70.tar.xz manaplus-98dabed4de60bc86522632379f2499aecbae2b70.zip | |
Fix compilation errors and warnings for another gcc 4.7 snapshot.
Diffstat (limited to 'src/net/tmwa')
| -rw-r--r-- | src/net/tmwa/buysellhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwa/generalhandler.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp index b6473400a..629aa54f6 100644 --- a/src/net/tmwa/buysellhandler.cpp +++ b/src/net/tmwa/buysellhandler.cpp @@ -69,7 +69,7 @@ BuySellHandler::BuySellHandler() }; handledMessages = _messages; buySellHandler = this; - mBuyDialog = 0; + mBuyDialog = nullptr; } void BuySellHandler::handleMessage(Net::MessageIn &msg) diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index 09c216ed3..a666fa5f4 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -201,9 +201,9 @@ void GeneralHandler::reload() static_cast<LoginHandler*>(mLoginHandler.get())->clearWorlds(); static_cast<CharServerHandler*>( - mCharHandler.get())->setCharCreateDialog(0); + mCharHandler.get())->setCharCreateDialog(nullptr); static_cast<CharServerHandler*>( - mCharHandler.get())->setCharSelectDialog(0); + mCharHandler.get())->setCharSelectDialog(nullptr); static_cast<PartyHandler*>(mPartyHandler.get())->reload(); } |