summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-05-01 21:57:50 +0300
committerAndrei Karas <akaras@inbox.ru>2017-05-01 21:57:50 +0300
commit8a1eb6607cdd4fbdc56b8217f7b9ec3987c1ec2d (patch)
tree9252c98b1fdf0f71aff58b8777090da94356c593
parent53f7874c0ae9e4e6337afdab6ec8383ae2f66f7c (diff)
downloadplus-8a1eb6607cdd4fbdc56b8217f7b9ec3987c1ec2d.tar.gz
plus-8a1eb6607cdd4fbdc56b8217f7b9ec3987c1ec2d.tar.bz2
plus-8a1eb6607cdd4fbdc56b8217f7b9ec3987c1ec2d.tar.xz
plus-8a1eb6607cdd4fbdc56b8217f7b9ec3987c1ec2d.zip
Remove ServerFeatures haveAdvancedBuySell because it depend only on server type.
-rw-r--r--src/gui/windows/buydialog.cpp3
-rw-r--r--src/gui/windows/npcselldialog.cpp3
-rw-r--r--src/net/eathena/serverfeatures.cpp5
-rw-r--r--src/net/eathena/serverfeatures.h2
-rw-r--r--src/net/serverfeatures.h2
-rw-r--r--src/net/tmwa/serverfeatures.cpp5
-rw-r--r--src/net/tmwa/serverfeatures.h2
7 files changed, 4 insertions, 18 deletions
diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp
index 1a2cf059b..9bf074ef5 100644
--- a/src/gui/windows/buydialog.cpp
+++ b/src/gui/windows/buydialog.cpp
@@ -50,6 +50,7 @@
#include "net/buysellhandler.h"
#include "net/cashshophandler.h"
#include "net/markethandler.h"
+#include "net/net.h"
#include "net/vendinghandler.h"
#include "net/serverfeatures.h"
#include "net/npchandler.h"
@@ -221,7 +222,7 @@ BuyDialog::BuyDialog(const BeingId npcId,
mMoney(0),
mAmountItems(0),
mMaxItems(0),
- mAdvanced(serverFeatures ? serverFeatures->haveAdvancedBuySell() : false)
+ mAdvanced(Net::getNetworkType() == ServerType::EATHENA)
{
init();
}
diff --git a/src/gui/windows/npcselldialog.cpp b/src/gui/windows/npcselldialog.cpp
index 807b252cb..28dacf1dc 100644
--- a/src/gui/windows/npcselldialog.cpp
+++ b/src/gui/windows/npcselldialog.cpp
@@ -34,6 +34,7 @@
#include "gui/widgets/slider.h"
#include "net/buysellhandler.h"
+#include "net/net.h"
#include "net/npchandler.h"
#include "net/serverfeatures.h"
@@ -46,7 +47,7 @@
NpcSellDialog::NpcSellDialog(const BeingId npcId) :
SellDialog(IsSell_true,
- (serverFeatures && serverFeatures->haveAdvancedBuySell()) ?
+ (Net::getNetworkType() == ServerType::EATHENA) ?
Advanced_true : Advanced_false),
mNpcId(npcId)
{
diff --git a/src/net/eathena/serverfeatures.cpp b/src/net/eathena/serverfeatures.cpp
index 164963c3c..2c7896eed 100644
--- a/src/net/eathena/serverfeatures.cpp
+++ b/src/net/eathena/serverfeatures.cpp
@@ -136,11 +136,6 @@ bool ServerFeatures::haveExtendedRiding() const
return serverVersion > 0;
}
-bool ServerFeatures::haveAdvancedBuySell() const
-{
- return true;
-}
-
bool ServerFeatures::haveSlide() const
{
return true;
diff --git a/src/net/eathena/serverfeatures.h b/src/net/eathena/serverfeatures.h
index cc73897af..509807adf 100644
--- a/src/net/eathena/serverfeatures.h
+++ b/src/net/eathena/serverfeatures.h
@@ -74,8 +74,6 @@ class ServerFeatures final : public Net::ServerFeatures
bool haveExtendedRiding() const override final;
- bool haveAdvancedBuySell() const override final A_CONST;
-
bool haveSlide() const override final;
bool haveExtendedDropsPosition() const override final;
diff --git a/src/net/serverfeatures.h b/src/net/serverfeatures.h
index 69d5fa5cf..5c8fc87f9 100644
--- a/src/net/serverfeatures.h
+++ b/src/net/serverfeatures.h
@@ -76,8 +76,6 @@ class ServerFeatures notfinal
virtual bool haveExtendedRiding() const = 0;
- virtual bool haveAdvancedBuySell() const = 0;
-
virtual bool haveSlide() const = 0;
virtual bool haveExtendedDropsPosition() const = 0;
diff --git a/src/net/tmwa/serverfeatures.cpp b/src/net/tmwa/serverfeatures.cpp
index 59f5bbe98..4613d55ed 100644
--- a/src/net/tmwa/serverfeatures.cpp
+++ b/src/net/tmwa/serverfeatures.cpp
@@ -134,11 +134,6 @@ bool ServerFeatures::haveExtendedRiding() const
return false;
}
-bool ServerFeatures::haveAdvancedBuySell() const
-{
- return false;
-}
-
bool ServerFeatures::haveSlide() const
{
return false;
diff --git a/src/net/tmwa/serverfeatures.h b/src/net/tmwa/serverfeatures.h
index a24b0c677..453ab9b35 100644
--- a/src/net/tmwa/serverfeatures.h
+++ b/src/net/tmwa/serverfeatures.h
@@ -74,8 +74,6 @@ class ServerFeatures final : public Net::ServerFeatures
bool haveExtendedRiding() const override final A_CONST;
- bool haveAdvancedBuySell() const override final A_CONST;
-
bool haveSlide() const override final A_CONST;
bool haveExtendedDropsPosition() const override final A_CONST;