diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-03-05 18:33:57 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-03-05 18:33:57 +0300 |
| commit | 1c34872aea8d196708aec8277017b467d01d09b0 (patch) | |
| tree | dd14d98c40666797d1c5c14f39a5f117d17d791c /src/net/ea | |
| parent | 3fae3f59aad1f1f2eee1e1bfa088672787bc9c78 (diff) | |
| download | plus-1c34872aea8d196708aec8277017b467d01d09b0.tar.gz plus-1c34872aea8d196708aec8277017b467d01d09b0.tar.bz2 plus-1c34872aea8d196708aec8277017b467d01d09b0.tar.xz plus-1c34872aea8d196708aec8277017b467d01d09b0.zip | |
Replace in Being speed field from vector to int.
Diffstat (limited to 'src/net/ea')
| -rw-r--r-- | src/net/ea/beingrecv.cpp | 2 | ||||
| -rw-r--r-- | src/net/ea/playerhandler.cpp | 9 | ||||
| -rw-r--r-- | src/net/ea/playerhandler.h | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/src/net/ea/beingrecv.cpp b/src/net/ea/beingrecv.cpp index 21e79a089..364236a08 100644 --- a/src/net/ea/beingrecv.cpp +++ b/src/net/ea/beingrecv.cpp @@ -458,7 +458,7 @@ void BeingRecv::processBeingMove3(Net::MessageIn &msg) return; } const int16_t speed = msg.readInt16("speed"); - dstBeing->setWalkSpeed(Vector(speed, speed, 0)); + dstBeing->setWalkSpeed(speed); int16_t x = msg.readInt16("x"); int16_t y = msg.readInt16("y"); diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index 65466ba5e..d6464028e 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -59,11 +59,9 @@ void PlayerHandler::ignoreAll(const bool ignore A_UNUSED) const { } -Vector PlayerHandler::getDefaultWalkSpeed() const +int PlayerHandler::getDefaultWalkSpeed() const { - // Return an normalized speed for any side - // as the offset is calculated elsewhere. - return Vector(150, 150, 0); + return 150; } bool PlayerHandler::canUseMagic() const @@ -85,8 +83,7 @@ void PlayerHandler::setStat(Net::MessageIn &msg, switch (type) { case Ea::WALK_SPEED: - localPlayer->setWalkSpeed(Vector(static_cast<float>( - base), static_cast<float>(base), 0)); + localPlayer->setWalkSpeed(base); PlayerInfo::setStatBase(Attributes::WALK_SPEED, base); PlayerInfo::setStatMod(Attributes::WALK_SPEED, 0); break; diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h index 18e62a2da..e5105dc16 100644 --- a/src/net/ea/playerhandler.h +++ b/src/net/ea/playerhandler.h @@ -52,7 +52,7 @@ class PlayerHandler notfinal : public Net::PlayerHandler bool canUseMagic() const override final; - Vector getDefaultWalkSpeed() const override final A_WARN_UNUSED; + int getDefaultWalkSpeed() const override final A_WARN_UNUSED; void setStat(Net::MessageIn &msg, const int type, |