summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-05-01 21:26:09 +0300
committerAndrei Karas <akaras@inbox.ru>2017-05-01 21:26:09 +0300
commita173e97258d7ac20fcfa8745ea772d2ba56b9d68 (patch)
treebba93729054b42ec3e7b16410470f9d918d345d8
parente82f8ed2976b6b6412ab66329e0794225e2030e7 (diff)
downloadplus-a173e97258d7ac20fcfa8745ea772d2ba56b9d68.tar.gz
plus-a173e97258d7ac20fcfa8745ea772d2ba56b9d68.tar.bz2
plus-a173e97258d7ac20fcfa8745ea772d2ba56b9d68.tar.xz
plus-a173e97258d7ac20fcfa8745ea772d2ba56b9d68.zip
Remove ServerFeatures haveExpPacket because it depend only on server type.
-rw-r--r--src/being/localplayer.cpp4
-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
6 files changed, 2 insertions, 18 deletions
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index df69ffb38..bf1167b5e 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -1231,7 +1231,7 @@ void LocalPlayer::statChanged(const AttributesT id,
{
if (!mShowJobExp ||
id != Attributes::PLAYER_JOB ||
- serverFeatures->haveExpPacket())
+ Net::getNetworkType() == ServerType::EATHENA)
{
return;
}
@@ -1254,7 +1254,7 @@ void LocalPlayer::attributeChanged(const AttributesT id,
{
case Attributes::PLAYER_EXP:
{
- if (serverFeatures->haveExpPacket())
+ if (Net::getNetworkType() == ServerType::EATHENA)
break;
if (oldVal > newVal)
break;
diff --git a/src/net/eathena/serverfeatures.cpp b/src/net/eathena/serverfeatures.cpp
index 74008e072..d83f2803e 100644
--- a/src/net/eathena/serverfeatures.cpp
+++ b/src/net/eathena/serverfeatures.cpp
@@ -131,11 +131,6 @@ bool ServerFeatures::haveServerWarpNames() const
return serverVersion == 0;
}
-bool ServerFeatures::haveExpPacket() const
-{
- return true;
-}
-
bool ServerFeatures::haveMute() const
{
return true;
diff --git a/src/net/eathena/serverfeatures.h b/src/net/eathena/serverfeatures.h
index 8e8d374f8..8fde10109 100644
--- a/src/net/eathena/serverfeatures.h
+++ b/src/net/eathena/serverfeatures.h
@@ -72,8 +72,6 @@ class ServerFeatures final : public Net::ServerFeatures
bool haveServerWarpNames() const override final;
- bool haveExpPacket() const override final A_CONST;
-
bool haveMute() const override final A_CONST;
bool haveTeamId() const override final A_CONST;
diff --git a/src/net/serverfeatures.h b/src/net/serverfeatures.h
index a5733ea4b..e80257eee 100644
--- a/src/net/serverfeatures.h
+++ b/src/net/serverfeatures.h
@@ -74,8 +74,6 @@ class ServerFeatures notfinal
virtual bool haveServerWarpNames() const = 0;
- virtual bool haveExpPacket() const = 0;
-
virtual bool haveMute() const = 0;
virtual bool haveTeamId() const = 0;
diff --git a/src/net/tmwa/serverfeatures.cpp b/src/net/tmwa/serverfeatures.cpp
index c006a691d..cfd2f7c56 100644
--- a/src/net/tmwa/serverfeatures.cpp
+++ b/src/net/tmwa/serverfeatures.cpp
@@ -129,11 +129,6 @@ bool ServerFeatures::haveServerWarpNames() const
return false;
}
-bool ServerFeatures::haveExpPacket() const
-{
- return false;
-}
-
bool ServerFeatures::haveMute() const
{
return false;
diff --git a/src/net/tmwa/serverfeatures.h b/src/net/tmwa/serverfeatures.h
index 2409de4f9..1d7894b0c 100644
--- a/src/net/tmwa/serverfeatures.h
+++ b/src/net/tmwa/serverfeatures.h
@@ -72,8 +72,6 @@ class ServerFeatures final : public Net::ServerFeatures
bool haveServerWarpNames() const override final A_CONST;
- bool haveExpPacket() const override final A_CONST;
-
bool haveMute() const override final A_CONST;
bool haveTeamId() const override final;