diff options
| author | Bertram <bertram@cegetel.net> | 2010-03-03 23:36:37 +0100 |
|---|---|---|
| committer | Bertram <bertram@cegetel.net> | 2010-03-03 23:36:37 +0100 |
| commit | 8cc31b582f372238ce6bd2c86888d312cf1fe5b2 (patch) | |
| tree | 8db5f864348d08a05b8533c7ede58e76741a98f8 /src/localplayer.h | |
| parent | b1845e9e081df1fc77d9bcbed3ab95792d6ba682 (diff) | |
| parent | d564943867452ad76e6d313a28870e640715dded (diff) | |
| download | mana-client-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.tar.gz mana-client-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.tar.bz2 mana-client-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.tar.xz mana-client-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.zip | |
Merge branch 'master' of gitorious.org:mana/mana
Conflicts:
src/being.cpp
Diffstat (limited to 'src/localplayer.h')
| -rw-r--r-- | src/localplayer.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/localplayer.h b/src/localplayer.h index 6279d546..919b5540 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -133,11 +133,6 @@ class LocalPlayer : public Player Inventory *getInventory() const { return mInventory; } /** - * Returns the player's storage - */ - Inventory *getStorage() const { return mStorage; } - - /** * Check the player has permission to invite users to specific guild */ bool checkInviteRights(const std::string &guildName); @@ -264,12 +259,6 @@ class LocalPlayer : public Player */ void pickedUp(const ItemInfo &itemInfo, int amount); - /** - * Accessors for mInStorage - */ - bool getInStorage() { return mInStorage; } - void setInStorage(bool inStorage); - int getHp() const { return mHp; } @@ -430,8 +419,6 @@ class LocalPlayer : public Player void startWalking(unsigned char dir); - bool mInStorage; /**< Whether storage is currently accessible */ - int mAttackRange; int mTargetTime; /** How long the being has been targeted **/ @@ -482,8 +469,6 @@ class LocalPlayer : public Player int mLocalWalkTime; /**< Timestamp used to control keyboard walk messages flooding */ - Inventory *mStorage; - /** Load the target cursors into memory */ void initTargetCursor(); |