summaryrefslogtreecommitdiff
path: root/src/gui/windows
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-05-08 18:43:49 +0300
committerAndrei Karas <akaras@inbox.ru>2017-05-08 18:43:49 +0300
commit0c1c6b5df196443b18e9e0ef2e9ef3de350a7234 (patch)
treee3f8ff1f0a844fca28c6ddc4af919880cbc2d5ac /src/gui/windows
parent4f96bf265375b7ca580f072f5a25c8b4097fb04a (diff)
downloadplus-0c1c6b5df196443b18e9e0ef2e9ef3de350a7234.tar.gz
plus-0c1c6b5df196443b18e9e0ef2e9ef3de350a7234.tar.bz2
plus-0c1c6b5df196443b18e9e0ef2e9ef3de350a7234.tar.xz
plus-0c1c6b5df196443b18e9e0ef2e9ef3de350a7234.zip
Fix wrong checks after removing some server features.
Diffstat (limited to 'src/gui/windows')
-rw-r--r--src/gui/windows/buydialog.cpp2
-rw-r--r--src/gui/windows/charselectdialog.cpp2
-rw-r--r--src/gui/windows/chatwindow.cpp4
-rw-r--r--src/gui/windows/npcselldialog.cpp2
-rw-r--r--src/gui/windows/shopwindow.cpp2
-rw-r--r--src/gui/windows/tradewindow.cpp2
6 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp
index c93ac6aa2..a07f9d849 100644
--- a/src/gui/windows/buydialog.cpp
+++ b/src/gui/windows/buydialog.cpp
@@ -221,7 +221,7 @@ BuyDialog::BuyDialog(const BeingId npcId,
mMoney(0),
mAmountItems(0),
mMaxItems(0),
- mAdvanced(Net::getNetworkType() == ServerType::EATHENA)
+ mAdvanced(Net::getNetworkType() != ServerType::TMWATHENA)
{
init();
}
diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp
index a2c40de7f..d697ebf2b 100644
--- a/src/gui/windows/charselectdialog.cpp
+++ b/src/gui/windows/charselectdialog.cpp
@@ -101,7 +101,7 @@ CharSelectDialog::CharSelectDialog(LoginData &data) :
placer(n, 0, mDeleteButton);
n ++;
#ifdef TMWA_SUPPORT
- if (Net::getNetworkType() == ServerType::EATHENA)
+ if (Net::getNetworkType() != ServerType::TMWATHENA)
#endif
{
mRenameButton = new Button(this,
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 1e10c08bb..45353fdc7 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -1299,7 +1299,7 @@ ChatTab *ChatWindow::addChatTab(const std::string &name,
const bool switchTo,
const bool join)
{
- if (Net::getNetworkType() == ServerType::EATHENA &&
+ if (Net::getNetworkType() != ServerType::TMWATHENA &&
name.size() > 1 &&
name[0] == '#')
{
@@ -1697,7 +1697,7 @@ bool ChatWindow::resortChatLog(std::string line,
tryRemoveColors);
}
}
- else if (Net::getNetworkType() == ServerType::EATHENA)
+ else if (Net::getNetworkType() != ServerType::TMWATHENA)
{
channelChatLog(channel, line, own, ignoreRecord, tryRemoveColors);
return false;
diff --git a/src/gui/windows/npcselldialog.cpp b/src/gui/windows/npcselldialog.cpp
index 7e964a7d1..7238cd8c6 100644
--- a/src/gui/windows/npcselldialog.cpp
+++ b/src/gui/windows/npcselldialog.cpp
@@ -46,7 +46,7 @@
NpcSellDialog::NpcSellDialog(const BeingId npcId) :
SellDialog(IsSell_true,
- (Net::getNetworkType() == ServerType::EATHENA) ?
+ (Net::getNetworkType() != ServerType::TMWATHENA) ?
Advanced_true : Advanced_false),
mNpcId(npcId)
{
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index f3d187aa6..4ba33a214 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -140,7 +140,7 @@ ShopWindow::ShopWindow() :
mSellShopSize(0),
mBuyShopSize(0),
isBuySelected(true),
- mHaveVending(Net::getNetworkType() == ServerType::EATHENA),
+ mHaveVending(Net::getNetworkType() != ServerType::TMWATHENA),
mEnableBuyingStore(false),
mEnableVending(false)
{
diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp
index cdd5837d9..982f2dafd 100644
--- a/src/gui/windows/tradewindow.cpp
+++ b/src/gui/windows/tradewindow.cpp
@@ -535,7 +535,7 @@ bool TradeWindow::checkItem(const Item *const item) const
}
return false;
}
- if (Net::getNetworkType() == ServerType::EATHENA &&
+ if (Net::getNetworkType() != ServerType::TMWATHENA &&
item->isEquipped() == Equipped_true)
{
if (localChatTab)