summaryrefslogtreecommitdiff
path: root/src/being.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/being.h
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.h')
-rw-r--r--src/being.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/being.h b/src/being.h
index 9b38e1479..9ee60fcdf 100644
--- a/src/being.h
+++ b/src/being.h
@@ -354,7 +354,7 @@ class Being : public ActorSprite, public ConfigListener
{ return static_cast<short>(mGuilds.size()); }
bool isInParty() const
- { return mParty != NULL; }
+ { return mParty; }
void setParty(Party *party);
@@ -761,10 +761,10 @@ class Being : public ActorSprite, public ConfigListener
void setAttackRange(int range)
{ mAttackRange = range; }
- void attack(Being *target = NULL, bool keep = false,
+ void attack(Being *target = nullptr, bool keep = false,
bool dontChangeEquipment = false);
- void attack2(Being *target = NULL, bool keep = false,
+ void attack2(Being *target = nullptr, bool keep = false,
bool dontChangeEquipment = false);
protected: