diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-11-13 04:57:16 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-11-13 04:57:16 +0300 |
| commit | 4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80 (patch) | |
| tree | c1edb8d8b368fdd43cd8639e6044b0f4e8dde70a /src/being.h | |
| parent | ece00592ecd93f7a96db0ca82589d00846e2f938 (diff) | |
| parent | d471e99fd38ac589a8a9e8e8677b9f577f0cc5c6 (diff) | |
| download | manaverse-4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80.tar.gz manaverse-4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80.tar.bz2 manaverse-4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80.tar.xz manaverse-4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80.zip | |
Merge branch 'master' into strippedstripped1.1.11.12
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
src/guichan/basiccontainer.cpp
src/guichan/focushandler.cpp
src/guichan/graphics.cpp
src/guichan/gui.cpp
src/guichan/image.cpp
src/guichan/include/guichan/widgets/checkbox.hpp
src/guichan/include/guichan/widgets/dropdown.hpp
src/guichan/sdl/sdlgraphics.cpp
src/guichan/sdl/sdlimage.cpp
src/guichan/widget.cpp
src/guichan/widgets/dropdown.cpp
src/guichan/widgets/icon.cpp
src/guichan/widgets/imagebutton.cpp
src/guichan/widgets/listbox.cpp
src/guichan/widgets/scrollarea.cpp
src/guichan/widgets/tab.cpp
src/guichan/widgets/tabbedarea.cpp
src/guichan/widgets/textbox.cpp
src/guichan/widgets/window.cpp
Diffstat (limited to 'src/being.h')
| -rw-r--r-- | src/being.h | 6 |
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: |