diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-10-02 18:57:10 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-10-02 18:57:10 +0300 |
| commit | f1e92aca00a4859047e83fab76220767b9a2f814 (patch) | |
| tree | 8aaa9d6853c6a8e0e8fc568c6f981cbd889b0cc3 /src/localplayer.h | |
| parent | 70b520b1e876f9698bb95baa2d274ea289a0c6bd (diff) | |
| parent | 99771a1fb50286fdb0b511f425312503e657eddc (diff) | |
| download | ManaVerse-stripped1.1.10.2.tar.gz ManaVerse-stripped1.1.10.2.tar.bz2 ManaVerse-stripped1.1.10.2.tar.xz ManaVerse-stripped1.1.10.2.zip | |
Merge branch 'master' into strippedstripped1.1.10.2
Conflicts:
packaging/debian/watch
Diffstat (limited to 'src/localplayer.h')
| -rw-r--r-- | src/localplayer.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/localplayer.h b/src/localplayer.h index cb23d855e..447306994 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -139,6 +139,8 @@ class LocalPlayer : public Being, public ActorSpriteListener, */ int getAttackRange(); + int getAttackRange2(); + void attack(Being *target = NULL, bool keep = false, bool dontChangeEquipment = false); @@ -152,6 +154,8 @@ class LocalPlayer : public Being, public ActorSpriteListener, void stopAttack(); + void untarget(); + /** * Returns the current target of the player. Returns 0 if no being is * currently targeted. @@ -601,6 +605,7 @@ class LocalPlayer : public Being, public ActorSpriteListener, bool mBlockAdvert; bool mEnableAdvert; bool mTradebot; + bool mTargetOnlyReachable; bool mNextStep; }; |