summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
Diffstat (limited to 'src/net')
-rw-r--r--src/net/ea/beingrecv.cpp2
-rw-r--r--src/net/ea/playerhandler.cpp9
-rw-r--r--src/net/ea/playerhandler.h2
-rw-r--r--src/net/eathena/beingrecv.cpp6
-rw-r--r--src/net/eathena/charserverrecv.cpp2
-rw-r--r--src/net/playerhandler.h2
-rw-r--r--src/net/tmwa/beingrecv.cpp10
7 files changed, 15 insertions, 18 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,
diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp
index b6e30d7fc..8e6293bbe 100644
--- a/src/net/eathena/beingrecv.cpp
+++ b/src/net/eathena/beingrecv.cpp
@@ -318,7 +318,7 @@ void BeingRecv::processBeingVisible(Net::MessageIn &msg)
if (speed == 0)
speed = 150;
- dstBeing->setWalkSpeed(Vector(speed, speed, 0));
+ dstBeing->setWalkSpeed(speed);
dstBeing->setSubtype(fromInt(job, BeingTypeId), 0);
if (dstBeing->getType() == ActorType::Monster && localPlayer)
localPlayer->checkNewName(dstBeing);
@@ -482,7 +482,7 @@ void BeingRecv::processBeingMove(Net::MessageIn &msg)
if (speed == 0)
speed = 150;
- dstBeing->setWalkSpeed(Vector(speed, speed, 0));
+ dstBeing->setWalkSpeed(speed);
dstBeing->setSubtype(fromInt(job, BeingTypeId), 0);
if (dstBeing->getType() == ActorType::Monster && localPlayer)
localPlayer->checkNewName(dstBeing);
@@ -656,7 +656,7 @@ void BeingRecv::processBeingSpawn(Net::MessageIn &msg)
if (speed == 0)
speed = 150;
- dstBeing->setWalkSpeed(Vector(speed, speed, 0));
+ dstBeing->setWalkSpeed(speed);
dstBeing->setSubtype(fromInt(job, BeingTypeId), 0);
if (dstBeing->getType() == ActorType::Monster && localPlayer)
localPlayer->checkNewName(dstBeing);
diff --git a/src/net/eathena/charserverrecv.cpp b/src/net/eathena/charserverrecv.cpp
index e82a8c144..452180d55 100644
--- a/src/net/eathena/charserverrecv.cpp
+++ b/src/net/eathena/charserverrecv.cpp
@@ -238,7 +238,7 @@ void CharServerRecv::processCharMapInfo(Net::MessageIn &restrict msg)
localPlayer = charServerHandler->mSelectedCharacter->dummy;
PlayerInfo::setBackend(charServerHandler->mSelectedCharacter->data);
PlayerInfo::setStatBase(Attributes::WALK_SPEED,
- playerHandler->getDefaultWalkSpeed().x);
+ playerHandler->getDefaultWalkSpeed());
charServerHandler->mSelectedCharacter->dummy = nullptr;
diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h
index 2a0e2d391..19682bda4 100644
--- a/src/net/playerhandler.h
+++ b/src/net/playerhandler.h
@@ -73,7 +73,7 @@ class PlayerHandler notfinal
virtual bool canUseMagic() const = 0;
- virtual Vector getDefaultWalkSpeed() const A_WARN_UNUSED = 0;
+ virtual int getDefaultWalkSpeed() const A_WARN_UNUSED = 0;
virtual void requestOnlineList() const = 0;
diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp
index 0c077b900..1d8f16871 100644
--- a/src/net/tmwa/beingrecv.cpp
+++ b/src/net/tmwa/beingrecv.cpp
@@ -278,7 +278,7 @@ void BeingRecv::processPlayerUpdate1(Net::MessageIn &msg)
dstBeing->setParty(party);
}
- dstBeing->setWalkSpeed(Vector(speed, speed, 0));
+ dstBeing->setWalkSpeed(speed);
const uint8_t hairStyle = msg.readUInt8("hair style");
const uint16_t look = msg.readUInt8("look");
@@ -414,7 +414,7 @@ void BeingRecv::processPlayerUpdate2(Net::MessageIn &msg)
dstBeing->setParty(party);
}
- dstBeing->setWalkSpeed(Vector(speed, speed, 0));
+ dstBeing->setWalkSpeed(speed);
const uint8_t hairStyle = msg.readUInt8("hair style");
const uint16_t look = msg.readUInt8("look");
@@ -546,7 +546,7 @@ void BeingRecv::processPlayerMove(Net::MessageIn &msg)
dstBeing->setParty(party);
}
- dstBeing->setWalkSpeed(Vector(speed, speed, 0));
+ dstBeing->setWalkSpeed(speed);
const uint8_t hairStyle = msg.readUInt8("hair style");
const uint16_t look = msg.readUInt8("look");
@@ -744,7 +744,7 @@ void BeingRecv::processBeingVisible(Net::MessageIn &msg)
dstBeing->setSubtype(fromInt(job, BeingTypeId), look);
if (dstBeing->getType() == ActorType::Monster && localPlayer)
localPlayer->checkNewName(dstBeing);
- dstBeing->setWalkSpeed(Vector(speed, speed, 0));
+ dstBeing->setWalkSpeed(speed);
const uint16_t weapon = msg.readInt16("weapon");
const uint16_t headBottom = msg.readInt16("head bottom");
@@ -945,7 +945,7 @@ void BeingRecv::processBeingMove(Net::MessageIn &msg)
dstBeing->setSubtype(fromInt(job, BeingTypeId), look);
if (dstBeing->getType() == ActorType::Monster && localPlayer)
localPlayer->checkNewName(dstBeing);
- dstBeing->setWalkSpeed(Vector(speed, speed, 0));
+ dstBeing->setWalkSpeed(speed);
const uint16_t weapon = msg.readInt16("weapon");
const uint16_t headBottom = msg.readInt16("head bottom");
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-06 19:11:05 +0000