diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-05-01 21:34:57 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-05-01 21:34:57 +0300 |
| commit | 348f7d0a0bc6142dbdcacddbca5b9003d5c25705 (patch) | |
| tree | f0b6271868701497a9d85db5b3917983ea1e9523 /src/net/tmwa | |
| parent | a12cecc9df169c16959ea3ddf3e22351e8248215 (diff) | |
| download | plus-348f7d0a0bc6142dbdcacddbca5b9003d5c25705.tar.gz plus-348f7d0a0bc6142dbdcacddbca5b9003d5c25705.tar.bz2 plus-348f7d0a0bc6142dbdcacddbca5b9003d5c25705.tar.xz plus-348f7d0a0bc6142dbdcacddbca5b9003d5c25705.zip | |
Remove ServerFeatures haveTeamId because it used only in tmwa.
Diffstat (limited to 'src/net/tmwa')
| -rw-r--r-- | src/net/tmwa/beingrecv.cpp | 5 | ||||
| -rw-r--r-- | src/net/tmwa/serverfeatures.cpp | 5 | ||||
| -rw-r--r-- | src/net/tmwa/serverfeatures.h | 2 |
3 files changed, 1 insertions, 11 deletions
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; |