diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-09-16 18:33:24 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-09-16 18:33:24 +0300 |
| commit | d54c371ad9d3c8a019d7d6bdc0262cd352a06ae5 (patch) | |
| tree | d3b37b48a41d6c72228ab214b7a65bb237c1ddb8 /src | |
| parent | a143251ee20a65b43c6d85d9f15bddf06dbc8804 (diff) | |
| download | manaplus-d54c371ad9d3c8a019d7d6bdc0262cd352a06ae5.tar.gz manaplus-d54c371ad9d3c8a019d7d6bdc0262cd352a06ae5.tar.bz2 manaplus-d54c371ad9d3c8a019d7d6bdc0262cd352a06ae5.tar.xz manaplus-d54c371ad9d3c8a019d7d6bdc0262cd352a06ae5.zip | |
Add server feature haveMove3.
Diffstat (limited to 'src')
| -rw-r--r-- | src/net/eathena/serverfeatures.cpp | 5 | ||||
| -rw-r--r-- | src/net/eathena/serverfeatures.h | 2 | ||||
| -rw-r--r-- | src/net/serverfeatures.h | 2 | ||||
| -rw-r--r-- | src/net/tmwa/beinghandler.cpp | 4 | ||||
| -rw-r--r-- | src/net/tmwa/serverfeatures.cpp | 5 | ||||
| -rw-r--r-- | src/net/tmwa/serverfeatures.h | 2 |
6 files changed, 18 insertions, 2 deletions
diff --git a/src/net/eathena/serverfeatures.cpp b/src/net/eathena/serverfeatures.cpp index 4cd9551cc..b0787cb40 100644 --- a/src/net/eathena/serverfeatures.cpp +++ b/src/net/eathena/serverfeatures.cpp @@ -97,4 +97,9 @@ bool ServerFeatures::haveServerIgnore() const return true; } +bool ServerFeatures::haveMove3() const +{ + return false; +} + } // namespace EAthena diff --git a/src/net/eathena/serverfeatures.h b/src/net/eathena/serverfeatures.h index 4fd393a95..045679659 100644 --- a/src/net/eathena/serverfeatures.h +++ b/src/net/eathena/serverfeatures.h @@ -59,6 +59,8 @@ class ServerFeatures final : public Net::ServerFeatures bool haveChatChannels() const override final; bool haveServerIgnore() const override final; + + bool haveMove3() const override final; }; } // namespace EAthena diff --git a/src/net/serverfeatures.h b/src/net/serverfeatures.h index 1f36d6b42..b3ed6f4ff 100644 --- a/src/net/serverfeatures.h +++ b/src/net/serverfeatures.h @@ -56,6 +56,8 @@ class ServerFeatures notfinal virtual bool haveChatChannels() const = 0; virtual bool haveServerIgnore() const = 0; + + virtual bool haveMove3() const = 0; }; } // namespace Net diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index 321727e77..2bf3ed887 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -949,7 +949,7 @@ void BeingHandler::processPlayerMove(Net::MessageIn &msg) const void BeingHandler::processBeingMove3(Net::MessageIn &msg) { BLOCK_START("BeingHandler::processBeingMove3") - if (serverVersion < 10) + if (!Net::getServerFeatures()->haveMove3()) { BLOCK_END("BeingHandler::processBeingMove3") return; @@ -1377,7 +1377,7 @@ void BeingHandler::processBeingMove(Net::MessageIn &msg) { dstBeing->setAction(BeingAction::STAND, 0); dstBeing->setTileCoords(srcX, srcY); - if (serverVersion < 10) + if (!Net::getServerFeatures()->haveMove3()) dstBeing->setDestination(dstX, dstY); } diff --git a/src/net/tmwa/serverfeatures.cpp b/src/net/tmwa/serverfeatures.cpp index b5b5fc11c..7f60f139f 100644 --- a/src/net/tmwa/serverfeatures.cpp +++ b/src/net/tmwa/serverfeatures.cpp @@ -99,4 +99,9 @@ bool ServerFeatures::haveServerIgnore() const return tmwServerVersion == 0; } +bool ServerFeatures::haveMove3() const +{ + return serverVersion >= 10; +} + } // namespace TmwAthena diff --git a/src/net/tmwa/serverfeatures.h b/src/net/tmwa/serverfeatures.h index 3ae22ffb0..8444fd930 100644 --- a/src/net/tmwa/serverfeatures.h +++ b/src/net/tmwa/serverfeatures.h @@ -59,6 +59,8 @@ class ServerFeatures final : public Net::ServerFeatures bool haveChatChannels() const override final; bool haveServerIgnore() const override final; + + bool haveMove3() const override final; }; } // namespace TmwAthena |