summaryrefslogtreecommitdiff
path: root/src/being.cpp
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/being.cpp
parentbc7d91cc0c9c0f6dcad01d612932c6899afb5514 (diff)
downloadManaVerse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.gz
ManaVerse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.bz2
ManaVerse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.xz
ManaVerse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.zip
Fix some warnings under gcc 4.7.
Diffstat (limited to 'src/being.cpp')
-rw-r--r--src/being.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/being.cpp b/src/being.cpp
index 5e8d68041..d73684ba0 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -223,7 +223,7 @@ Being::Being(int id, Type type, Uint16 subtype, Map *map):
mSpriteDirection(DIRECTION_DOWN),
mDispName(0),
mShowName(false),
- mEquippedWeapon(NULL),
+ mEquippedWeapon(nullptr),
mText(0),
mLevel(0),
mGender(GENDER_UNSPECIFIED),
@@ -1678,13 +1678,13 @@ void Being::setSprite(unsigned int slot, int id, std::string color,
removeSprite(slot);
if (isWeapon)
- mEquippedWeapon = NULL;
+ mEquippedWeapon = nullptr;
}
else
{
const ItemInfo &info = ItemDB::get(id);
std::string filename = info.getSprite(mGender);
- AnimatedSprite *equipmentSprite = NULL;
+ AnimatedSprite *equipmentSprite = nullptr;
if (!filename.empty())
{