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/being.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/being.cpp') 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()) { -- cgit v1.2.3-60-g2f50