From 9e83411f7e4147d09af5a5006888dcc187ea0ef8 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 7 Nov 2011 19:34:52 +0300
Subject: Fix some warnings under gcc 4.7.

---
 src/net/ea/gamehandler.cpp    | 2 +-
 src/net/ea/inventoryhandler.h | 3 ++-
 src/net/ea/playerhandler.cpp  | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/net/ea')

diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp
index a202cbc86..b74f2384d 100644
--- a/src/net/ea/gamehandler.cpp
+++ b/src/net/ea/gamehandler.cpp
@@ -96,7 +96,7 @@ void GameHandler::processCharSwitchResponse(Net::MessageIn &msg)
 void GameHandler::processMapQuitResponse(Net::MessageIn &msg)
 {
     if (msg.readInt8())
-        new OkDialog(_("Game"), _("Request to quit denied!"), NULL);
+        new OkDialog(_("Game"), _("Request to quit denied!"), nullptr);
 }
 
 } // namespace Ea
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index 3a99bc47f..72b993c4b 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -25,6 +25,7 @@
 
 #include "equipment.h"
 #include "inventory.h"
+#include "localconsts.h"
 #include "logger.h"
 #include "playerinfo.h"
 
@@ -58,7 +59,7 @@ class EquipBackend : public Equipment::Backend
         {
             int invyIndex = mEquipment[index];
             if (invyIndex == -1)
-                return NULL;
+                return nullptr;
 
             if (PlayerInfo::getInventory())
                 return PlayerInfo::getInventory()->getItem(invyIndex);
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 3009426ae..02af3dbb4 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -59,7 +59,7 @@ namespace
     {
         void action(const gcn::ActionEvent &event A_UNUSED)
         {
-            weightNotice = NULL;
+            weightNotice = nullptr;
         }
     } weightListener;
 
@@ -72,7 +72,7 @@ namespace
         {
             if (Net::getPlayerHandler())
                 Net::getPlayerHandler()->respawn();
-            deathNotice = NULL;
+            deathNotice = nullptr;
 
             Game::closeDialogs();
 
-- 
cgit v1.2.3-70-g09d2