diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-02-01 23:48:15 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-02-02 22:48:03 +0300 |
commit | 6dc1f5e0b68cf390f7938329b50a9b28bd187862 (patch) | |
tree | 29e30e48cc03d95aeff278f6842f3a15de8f4106 /src/being | |
parent | c8c51d7550adf9c952a4be54398df7e7a6f341a8 (diff) | |
download | manaplus-6dc1f5e0b68cf390f7938329b50a9b28bd187862.tar.gz manaplus-6dc1f5e0b68cf390f7938329b50a9b28bd187862.tar.bz2 manaplus-6dc1f5e0b68cf390f7938329b50a9b28bd187862.tar.xz manaplus-6dc1f5e0b68cf390f7938329b50a9b28bd187862.zip |
Set correct vending status to local player.
Allow buy from vending shop.
Diffstat (limited to 'src/being')
-rw-r--r-- | src/being/being.cpp | 6 | ||||
-rw-r--r-- | src/being/being.h | 2 | ||||
-rw-r--r-- | src/being/playerinfo.cpp | 11 | ||||
-rw-r--r-- | src/being/playerinfo.h | 4 |
4 files changed, 23 insertions, 0 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp index 170ad3f15..004e728c6 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -3537,3 +3537,9 @@ void Being::setBoard(const std::string &text) mBoard = text; updateName(); } + +void Being::enableShop(const bool b) +{ + mShop = b; + updateName(); +} diff --git a/src/being/being.h b/src/being/being.h index 6453e272d..043124c58 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -764,6 +764,8 @@ class Being notfinal : public ActorSprite, bool isShopEnabled() const A_WARN_UNUSED { return mShop; } + void enableShop(const bool b); + /** * Sets the attack range. */ diff --git a/src/being/playerinfo.cpp b/src/being/playerinfo.cpp index eb26ab892..91d0119b9 100644 --- a/src/being/playerinfo.cpp +++ b/src/being/playerinfo.cpp @@ -67,6 +67,7 @@ PetInfo *mPet = nullptr; GuildPositionFlags::Type mGuildPositionFlags = GuildPositionFlags::None; bool mTrading = false; +bool mVending = false; int mLevelProgress = 0; std::set<int> mProtectedItems; @@ -572,4 +573,14 @@ GuildPositionFlags::Type getGuildPositionFlags() return mGuildPositionFlags; } +void enableVending(const bool b) +{ + mVending = b; +} + +bool isVending() +{ + return mVending; +} + } // namespace PlayerInfo diff --git a/src/being/playerinfo.h b/src/being/playerinfo.h index 807d9d03d..1f91f6e3d 100644 --- a/src/being/playerinfo.h +++ b/src/being/playerinfo.h @@ -268,6 +268,10 @@ namespace PlayerInfo void setGuildPositionFlags(const GuildPositionFlags::Type pos); GuildPositionFlags::Type getGuildPositionFlags(); + + void enableVending(const bool b); + + bool isVending() A_WARN_UNUSED; } // namespace PlayerInfo #endif // BEING_PLAYERINFO_H |