diff options
| -rw-r--r-- | src/being/being.cpp | 6 | ||||
| -rw-r--r-- | src/being/being.h | 8 | ||||
| -rw-r--r-- | src/gui/popups/beingpopup.cpp | 16 | ||||
| -rw-r--r-- | src/gui/popups/beingpopup.h | 2 | ||||
| -rw-r--r-- | src/net/eathena/vendinghandler.cpp | 4 |
5 files changed, 18 insertions, 18 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp index 004e728c6..60b87914c 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -175,7 +175,7 @@ Being::Being(const int id, mSpriteHide(new int[20]), mSpriteDraw(new int[20]), mComment(), - mBoard(), + mSellBoard(), mPets(), mOwner(nullptr), mSpecialParticle(nullptr), @@ -3531,10 +3531,10 @@ void Being::setChat(ChatObject *const obj) mChat = obj; } -void Being::setBoard(const std::string &text) +void Being::setSellBoard(const std::string &text) { mShop = !text.empty(); - mBoard = text; + mSellBoard = text; updateName(); } diff --git a/src/being/being.h b/src/being/being.h index 043124c58..e0fd0f044 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -913,10 +913,10 @@ class Being notfinal : public ActorSprite, void setAreaSize(const int areaSize) { mAreaSize = areaSize; } - void setBoard(const std::string &text); + void setSellBoard(const std::string &text); - std::string getBoard() const A_WARN_UNUSED - { return mBoard; } + std::string getSellBoard() const A_WARN_UNUSED + { return mSellBoard; } protected: /** @@ -1033,7 +1033,7 @@ class Being notfinal : public ActorSprite, int *mSpriteHide; int *mSpriteDraw; std::string mComment; - std::string mBoard; + std::string mSellBoard; std::vector<Being*> mPets; Being *mOwner; Particle *mSpecialParticle; diff --git a/src/gui/popups/beingpopup.cpp b/src/gui/popups/beingpopup.cpp index 7a3194a36..2fa9368cf 100644 --- a/src/gui/popups/beingpopup.cpp +++ b/src/gui/popups/beingpopup.cpp @@ -44,7 +44,7 @@ BeingPopup::BeingPopup() : mBeingGuild(new Label(this, "A")), mBeingRank(new Label(this, "A")), mBeingComment(new Label(this, "A")), - mBeingBoard(new Label(this, "A")) + mBeingSellBoard(new Label(this, "A")) { // Being Name mBeingName->setFont(boldFont); @@ -58,7 +58,7 @@ BeingPopup::BeingPopup() : // Being's party mBeingGuild->setPosition(0, 2 * fontHeight); mBeingRank->setPosition(0, 3 * fontHeight); - mBeingBoard->setPosition(0, 4 * fontHeight); + mBeingSellBoard->setPosition(0, 4 * fontHeight); mBeingComment->setPosition(0, 5 * fontHeight); mBeingParty->setForegroundColorAll(getThemeColor(Theme::POPUP), @@ -67,7 +67,7 @@ BeingPopup::BeingPopup() : getThemeColor(Theme::POPUP_OUTLINE)); mBeingRank->setForegroundColorAll(getThemeColor(Theme::POPUP), getThemeColor(Theme::POPUP_OUTLINE)); - mBeingBoard->setForegroundColorAll(getThemeColor(Theme::POPUP), + mBeingSellBoard->setForegroundColorAll(getThemeColor(Theme::POPUP), getThemeColor(Theme::POPUP_OUTLINE)); mBeingComment->setForegroundColorAll(getThemeColor(Theme::POPUP), getThemeColor(Theme::POPUP_OUTLINE)); @@ -84,7 +84,7 @@ void BeingPopup::postInit() add(mBeingGuild); add(mBeingRank); add(mBeingComment); - add(mBeingBoard); + add(mBeingSellBoard); } void BeingPopup::show(const int x, const int y, Being *const b) @@ -98,7 +98,7 @@ void BeingPopup::show(const int x, const int y, Being *const b) Label *label1 = mBeingParty; Label *label2 = mBeingGuild; Label *label3 = mBeingRank; - Label *label4 = mBeingBoard; + Label *label4 = mBeingSellBoard; Label *label5 = mBeingComment; b->updateComment(); @@ -180,11 +180,11 @@ void BeingPopup::show(const int x, const int y, Being *const b) label3 = nullptr; } - if (!b->getBoard().empty()) + if (!b->getSellBoard().empty()) { // TRANSLATORS: being popup label - label4->setCaption(strprintf(_("Shop: %s"), - b->getBoard().c_str())); + label4->setCaption(strprintf(_("Sell shop: %s"), + b->getSellBoard().c_str())); label4->adjustSize(); } else diff --git a/src/gui/popups/beingpopup.h b/src/gui/popups/beingpopup.h index 8f43719ae..8ba82babb 100644 --- a/src/gui/popups/beingpopup.h +++ b/src/gui/popups/beingpopup.h @@ -62,7 +62,7 @@ class BeingPopup final : public Popup Label *mBeingGuild; Label *mBeingRank; Label *mBeingComment; - Label *mBeingBoard; + Label *mBeingSellBoard; }; extern BeingPopup *beingPopup; diff --git a/src/net/eathena/vendinghandler.cpp b/src/net/eathena/vendinghandler.cpp index f63a35176..9f4218608 100644 --- a/src/net/eathena/vendinghandler.cpp +++ b/src/net/eathena/vendinghandler.cpp @@ -114,7 +114,7 @@ void VendingHandler::processShowBoard(Net::MessageIn &msg) const std::string shopName = msg.readString(80, "shop name"); Being *const dstBeing = actorManager->findBeing(id); if (dstBeing) - dstBeing->setBoard(shopName); + dstBeing->setSellBoard(shopName); } void VendingHandler::processHideBoard(Net::MessageIn &msg) @@ -122,7 +122,7 @@ void VendingHandler::processHideBoard(Net::MessageIn &msg) const int id = msg.readInt32("owner id"); Being *const dstBeing = actorManager->findBeing(id); if (dstBeing) - dstBeing->setBoard(std::string()); + dstBeing->setSellBoard(std::string()); if (dstBeing == localPlayer) { PlayerInfo::enableVending(false); |