diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-11-07 19:34:52 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-11-07 19:34:52 +0300 |
| commit | 9e83411f7e4147d09af5a5006888dcc187ea0ef8 (patch) | |
| tree | c084bdf8afabc6220779645dcb5dbf71af6a151f /src/localplayer.h | |
| parent | bc7d91cc0c9c0f6dcad01d612932c6899afb5514 (diff) | |
| download | manaverse-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/localplayer.h')
| -rw-r--r-- | src/localplayer.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/localplayer.h b/src/localplayer.h index 4183f2d1b..08ebbe841 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -28,6 +28,7 @@ #include "client.h" #include "game.h" #include "listener.h" +#include "localconsts.h" #include "gui/userpalette.h" @@ -136,10 +137,10 @@ class LocalPlayer : public Being, public ActorSpriteListener, int getAttackRange2(); - 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); void setGMLevel(int level); @@ -422,7 +423,7 @@ class LocalPlayer : public Being, public ActorSpriteListener, { return mPickUpTarget; } void unSetPickUpTarget() - { mPickUpTarget = 0; } + { mPickUpTarget = nullptr; } /** * Stop following a player. |