diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-10-17 22:07:24 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-10-17 22:07:24 +0300 |
| commit | d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a (patch) | |
| tree | 5f128768c66436eefd70632f02889607596609d4 /src/localplayer.h | |
| parent | f1e92aca00a4859047e83fab76220767b9a2f814 (diff) | |
| parent | e93e6beb456d105987da3190c2a80847b6900081 (diff) | |
| download | plus-stripped1.1.10.16.tar.gz plus-stripped1.1.10.16.tar.bz2 plus-stripped1.1.10.16.tar.xz plus-stripped1.1.10.16.zip | |
Merge branch 'master' into strippedstripped1.1.10.16
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
Diffstat (limited to 'src/localplayer.h')
| -rw-r--r-- | src/localplayer.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/localplayer.h b/src/localplayer.h index 447306994..414933e70 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -130,11 +130,6 @@ class LocalPlayer : public Being, public ActorSpriteListener, void actorSpriteDestroyed(const ActorSprite &actorSprite); /** - * Sets the attack range. - */ - void setAttackRange(int range) { mAttackRange = range; } - - /** * Gets the attack range. */ int getAttackRange(); @@ -506,8 +501,6 @@ class LocalPlayer : public Being, public ActorSpriteListener, bool mInStorage; /**< Whether storage is currently accessible */ - int mAttackRange; - int mTargetTime; /** How long the being has been targeted **/ int mLastTarget; /** Time stamp of last targeting action, -1 if none. */ |