From 9e83411f7e4147d09af5a5006888dcc187ea0ef8 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 7 Nov 2011 19:34:52 +0300 Subject: Fix some warnings under gcc 4.7. --- src/net/ea/inventoryhandler.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/net/ea/inventoryhandler.h') 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); -- cgit v1.2.3-60-g2f50