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/localplayer.h | |
parent | ece00592ecd93f7a96db0ca82589d00846e2f938 (diff) | |
parent | d471e99fd38ac589a8a9e8e8677b9f577f0cc5c6 (diff) | |
download | plus-4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80.tar.gz plus-4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80.tar.bz2 plus-4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80.tar.xz plus-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/localplayer.h')
-rw-r--r-- | src/localplayer.h | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/src/localplayer.h b/src/localplayer.h index 414933e70..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); @@ -271,9 +272,14 @@ class LocalPlayer : public Being, public ActorSpriteListener, void switchMagicAttack(); + void switchPvpAttack(); + int getMagicAttackType() { return mMagicAttackType ; } + int getPvpAttackType() + { return mPvpAttackType ; } + int getMoveToTargetType() { return mMoveToTargetType ; } @@ -325,14 +331,16 @@ class LocalPlayer : public Being, public ActorSpriteListener, void changeAwayMode(); - bool getAwayMode() - { return mAwayMode; } - void setAway(const std::string &message); + void setPseudoAway(const std::string &message); + bool getAway() { return mAwayMode; } + bool getPseudoAway() + { return mPseudoAwayMode; } + void setHalfAway(bool n) { mInactive = n; } @@ -415,7 +423,7 @@ class LocalPlayer : public Being, public ActorSpriteListener, { return mPickUpTarget; } void unSetPickUpTarget() - { mPickUpTarget = 0; } + { mPickUpTarget = nullptr; } /** * Stop following a player. @@ -473,6 +481,8 @@ class LocalPlayer : public Being, public ActorSpriteListener, void stopAdvert(); + bool checAttackPermissions(Being *target); + protected: /** Whether or not the name settings have changed */ bool mUpdateName; @@ -524,6 +534,8 @@ class LocalPlayer : public Being, public ActorSpriteListener, unsigned int mPickUpType; //magic attack type unsigned int mMagicAttackType; + //pvp attack type + unsigned int mPvpAttackType; //type how move to target unsigned int mMoveToTargetType; unsigned int mAttackType; @@ -571,6 +583,7 @@ class LocalPlayer : public Being, public ActorSpriteListener, int mPingTime; int mAfkTime; bool mAwayMode; + bool mPseudoAwayMode; bool mShowNavigePath; bool mIsServerBuggy; |