summaryrefslogtreecommitdiff
path: root/src/equipment.h
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/equipment.h
parentbc7d91cc0c9c0f6dcad01d612932c6899afb5514 (diff)
downloadmanaplus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.gz
manaplus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.bz2
manaplus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.xz
manaplus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.zip
Fix some warnings under gcc 4.7.
Diffstat (limited to 'src/equipment.h')
-rw-r--r--src/equipment.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/equipment.h b/src/equipment.h
index 71b4b8593..2b6dae3ce 100644
--- a/src/equipment.h
+++ b/src/equipment.h
@@ -25,6 +25,8 @@
#define EQUIPMENT_SIZE 13
+#include "localconsts.h"
+
class Item;
class Equipment
@@ -33,14 +35,14 @@ class Equipment
/**
* Constructor.
*/
- Equipment(): mBackend(0)
+ Equipment(): mBackend(nullptr)
{ }
/**
* Destructor.
*/
~Equipment()
- { mBackend = 0; }
+ { mBackend = nullptr; }
enum Slot
{
@@ -72,7 +74,7 @@ class Equipment
* Get equipment at the given slot.
*/
Item *getEquipment(int index) const
- { return mBackend ? mBackend->getEquipment(index) : 0; }
+ { return mBackend ? mBackend->getEquipment(index) : nullptr; }
/**
* Clears equipment.