From 348f7d0a0bc6142dbdcacddbca5b9003d5c25705 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 1 May 2017 21:34:57 +0300
Subject: Remove ServerFeatures haveTeamId because it used only in tmwa.

---
 src/net/eathena/serverfeatures.cpp | 5 -----
 src/net/eathena/serverfeatures.h   | 2 --
 src/net/serverfeatures.h           | 2 --
 src/net/tmwa/beingrecv.cpp         | 5 +----
 src/net/tmwa/serverfeatures.cpp    | 5 -----
 src/net/tmwa/serverfeatures.h      | 2 --
 6 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/src/net/eathena/serverfeatures.cpp b/src/net/eathena/serverfeatures.cpp
index 7ca6c3b27..5005e261e 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::haveTeamId() const
-{
-    return false;
-}
-
 bool ServerFeatures::haveExtendedRiding() const
 {
     return true;
diff --git a/src/net/eathena/serverfeatures.h b/src/net/eathena/serverfeatures.h
index ce50ca6ca..cc73897af 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 haveTeamId() const override final A_CONST;
-
         bool haveExtendedRiding() const override final;
 
         bool haveAdvancedBuySell() const override final A_CONST;
diff --git a/src/net/serverfeatures.h b/src/net/serverfeatures.h
index 7b1fab08a..69d5fa5cf 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 haveTeamId() const = 0;
-
         virtual bool haveExtendedRiding() const = 0;
 
         virtual bool haveAdvancedBuySell() const = 0;
diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp
index 141f8e261..4b1bb631b 100644
--- a/src/net/tmwa/beingrecv.cpp
+++ b/src/net/tmwa/beingrecv.cpp
@@ -1382,10 +1382,7 @@ void BeingRecv::processPvpSet(Net::MessageIn &msg)
     const BeingId id = msg.readBeingId("being id");
     const int rank = msg.readInt32("rank");
     int teamId = 0;
-    if (serverFeatures->haveTeamId())
-        teamId = msg.readInt32("team");
-    else
-        msg.readInt32("num");
+    teamId = msg.readInt32("team");
     if (actorManager)
     {
         Being *const dstBeing = actorManager->findBeing(id);
diff --git a/src/net/tmwa/serverfeatures.cpp b/src/net/tmwa/serverfeatures.cpp
index e7e523be6..59f5bbe98 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::haveTeamId() const
-{
-    return true;
-}
-
 bool ServerFeatures::haveExtendedRiding() const
 {
     return false;
diff --git a/src/net/tmwa/serverfeatures.h b/src/net/tmwa/serverfeatures.h
index 5cf1be343..a24b0c677 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 haveTeamId() const override final;
-
         bool haveExtendedRiding() const override final A_CONST;
 
         bool haveAdvancedBuySell() const override final A_CONST;
-- 
cgit v1.2.3-60-g2f50