diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-05-01 17:52:56 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-05-01 17:52:56 +0300 |
| commit | 87918db755040bb693cb286d8fb0bcfd97d761af (patch) | |
| tree | 581d2df22397f829e407d6b5235193e1bf26aac6 /src/resources/item/shopitem.cpp | |
| parent | d8e382e49317adf9717d83509c6975f8958f5043 (diff) | |
| download | manaplus-87918db755040bb693cb286d8fb0bcfd97d761af.tar.gz manaplus-87918db755040bb693cb286d8fb0bcfd97d761af.tar.bz2 manaplus-87918db755040bb693cb286d8fb0bcfd97d761af.tar.xz manaplus-87918db755040bb693cb286d8fb0bcfd97d761af.zip | |
Remove ServerFeatures haveItemColors because it depend only by server type.
Diffstat (limited to 'src/resources/item/shopitem.cpp')
| -rw-r--r-- | src/resources/item/shopitem.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/resources/item/shopitem.cpp b/src/resources/item/shopitem.cpp index 27a496814..55926c46d 100644 --- a/src/resources/item/shopitem.cpp +++ b/src/resources/item/shopitem.cpp @@ -26,6 +26,7 @@ #include "utils/stringutils.h" +#include "net/net.h" #include "net/serverfeatures.h" #include "resources/db/unitsdb.h" @@ -96,10 +97,12 @@ ShopItem::~ShopItem() void ShopItem::updateDisplayName(const int quantity) { - if (serverFeatures->haveItemColors()) - mDisplayName = std::string(getInfo().getName(mColor)); - else +#ifdef TMWA_SUPPORT + if (Net::getNetworkType() == ServerType::TMWATHENA) mDisplayName = std::string(getInfo().getName()); + else +#endif // TMWA_SUPPORT + mDisplayName = std::string(getInfo().getName(mColor)); if (mPrice) { mDisplayName.append(" (").append( |