summaryrefslogtreecommitdiff
path: root/src/net/ea
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-11-07 19:34:52 +0300
committerAndrei Karas <akaras@inbox.ru>2011-11-07 19:34:52 +0300
commit9e83411f7e4147d09af5a5006888dcc187ea0ef8 (patch)
treec084bdf8afabc6220779645dcb5dbf71af6a151f /src/net/ea
parentbc7d91cc0c9c0f6dcad01d612932c6899afb5514 (diff)
downloadplus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.gz
plus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.bz2
plus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.xz
plus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.zip
Fix some warnings under gcc 4.7.
Diffstat (limited to 'src/net/ea')
-rw-r--r--src/net/ea/gamehandler.cpp2
-rw-r--r--src/net/ea/inventoryhandler.h3
-rw-r--r--src/net/ea/playerhandler.cpp4
3 files changed, 5 insertions, 4 deletions
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();