summaryrefslogtreecommitdiff
path: root/src/net/ea/tradehandler.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-11-08 00:44:17 +0300
committerAndrei Karas <akaras@inbox.ru>2011-11-08 00:44:17 +0300
commit4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe (patch)
tree714897eca03fbcb764f5b450a29cc1aef8d33433 /src/net/ea/tradehandler.cpp
parent9e83411f7e4147d09af5a5006888dcc187ea0ef8 (diff)
downloadplus-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.gz
plus-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.bz2
plus-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.xz
plus-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.zip
Fix more gcc 4.7 warnings.
Diffstat (limited to 'src/net/ea/tradehandler.cpp')
-rw-r--r--src/net/ea/tradehandler.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp
index 19aa474e3..5aaa09f91 100644
--- a/src/net/ea/tradehandler.cpp
+++ b/src/net/ea/tradehandler.cpp
@@ -53,7 +53,7 @@ namespace
{
void action(const gcn::ActionEvent &event)
{
- confirmDlg = 0;
+ confirmDlg = nullptr;
if (event.getId() == "ignore")
player_relations.ignoreTrade(tradePartnerName);
Net::getTradeHandler()->respond(event.getId() == "yes");
@@ -66,7 +66,7 @@ namespace Ea
TradeHandler::TradeHandler()
{
- confirmDlg = 0;
+ confirmDlg = nullptr;
}
void TradeHandler::removeItem(int slotNum A_UNUSED, int amount A_UNUSED)
@@ -204,7 +204,7 @@ void TradeHandler::processTradeItemAddResponse(Net::MessageIn &msg)
{
// Trade: New Item add response (was 0x00ea, now 01b1)
const int index = msg.readInt16() - INVENTORY_OFFSET;
- Item *item = 0;
+ Item *item = nullptr;
if (PlayerInfo::getInventory())
item = PlayerInfo::getInventory()->getItem(index);