summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
Diffstat (limited to 'src/net')
-rw-r--r--src/net/eathena/beingrecv.cpp19
-rw-r--r--src/net/eathena/gamerecv.cpp3
-rw-r--r--src/net/eathena/playerrecv.cpp5
-rw-r--r--src/net/tmwa/beingrecv.cpp24
-rw-r--r--src/net/tmwa/gamerecv.cpp3
-rw-r--r--src/net/tmwa/playerrecv.cpp5
6 files changed, 44 insertions, 15 deletions
diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp
index f05148810..ec7f4dc09 100644
--- a/src/net/eathena/beingrecv.cpp
+++ b/src/net/eathena/beingrecv.cpp
@@ -546,7 +546,8 @@ void BeingRecv::processBeingVisible(Net::MessageIn &msg)
true);
uint8_t dir;
- uint16_t x, y;
+ uint16_t x;
+ uint16_t y;
msg.readCoordinates(x, y, dir, "position");
msg.readInt8("xs");
msg.readInt8("ys");
@@ -728,7 +729,10 @@ void BeingRecv::processBeingMove(Net::MessageIn &msg)
gloves,
!serverFeatures->haveMove3());
- uint16_t srcX, srcY, dstX, dstY;
+ uint16_t srcX;
+ uint16_t srcY;
+ uint16_t dstX;
+ uint16_t dstY;
msg.readCoordinatePair(srcX, srcY, dstX, dstY, "move path");
msg.readUInt8("(sx<<4) | (sy&0x0f)");
msg.readInt8("xs");
@@ -915,7 +919,8 @@ void BeingRecv::processBeingSpawn(Net::MessageIn &msg)
true);
uint8_t dir;
- uint16_t x, y;
+ uint16_t x;
+ uint16_t y;
msg.readCoordinates(x, y, dir, "position");
msg.readInt8("xs");
msg.readInt8("ys");
@@ -1153,7 +1158,10 @@ void BeingRecv::processBeingMove2(Net::MessageIn &msg)
Being *const dstBeing = actorManager->findBeing(
msg.readBeingId("being id"));
- uint16_t srcX, srcY, dstX, dstY;
+ uint16_t srcX;
+ uint16_t srcY;
+ uint16_t dstX;
+ uint16_t dstY;
msg.readCoordinatePair(srcX, srcY, dstX, dstY, "move path");
msg.readUInt8("(sx<<4) | (sy&0x0f)");
msg.readInt32("tick");
@@ -1707,7 +1715,8 @@ void BeingRecv::processBeingRemoveSkill(Net::MessageIn &msg)
void BeingRecv::processBeingFakeName(Net::MessageIn &msg)
{
- uint16_t x, y;
+ uint16_t x;
+ uint16_t y;
uint8_t dir;
if (msg.getVersion() < 20071106)
{
diff --git a/src/net/eathena/gamerecv.cpp b/src/net/eathena/gamerecv.cpp
index 9a517c74f..d78d5d92d 100644
--- a/src/net/eathena/gamerecv.cpp
+++ b/src/net/eathena/gamerecv.cpp
@@ -47,7 +47,8 @@ void GameRecv::processMapAccountId(Net::MessageIn &msg)
void GameRecv::processMapLogin(Net::MessageIn &msg)
{
unsigned char direction;
- uint16_t x, y;
+ uint16_t x;
+ uint16_t y;
msg.readInt32("start time");
msg.readCoordinates(x, y, direction, "position");
msg.readInt8("x size");
diff --git a/src/net/eathena/playerrecv.cpp b/src/net/eathena/playerrecv.cpp
index dfaa98b75..32336249d 100644
--- a/src/net/eathena/playerrecv.cpp
+++ b/src/net/eathena/playerrecv.cpp
@@ -255,7 +255,10 @@ void PlayerRecv::processWalkResponse(Net::MessageIn &msg)
* and that the server will send a correction notice
* otherwise.
*/
- uint16_t srcX, srcY, dstX, dstY;
+ uint16_t srcX;
+ uint16_t srcY;
+ uint16_t dstX;
+ uint16_t dstY;
msg.readInt32("tick");
msg.readCoordinatePair(srcX, srcY, dstX, dstY, "move path");
msg.readUInt8("(sx<<4) | (sy&0x0f)");
diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp
index 69744946b..72ba7e2ab 100644
--- a/src/net/tmwa/beingrecv.cpp
+++ b/src/net/tmwa/beingrecv.cpp
@@ -353,7 +353,8 @@ void BeingRecv::processPlayerUpdate1(Net::MessageIn &msg)
}
localPlayer->imitateOutfit(dstBeing, -1);
- uint16_t x, y;
+ uint16_t x;
+ uint16_t y;
msg.readCoordinates(x, y, dir, "position");
dstBeing->setTileCoords(x, y);
dstBeing->setDirection(dir);
@@ -497,7 +498,8 @@ void BeingRecv::processPlayerUpdate2(Net::MessageIn &msg)
}
localPlayer->imitateOutfit(dstBeing, -1);
- uint16_t x, y;
+ uint16_t x;
+ uint16_t y;
msg.readCoordinates(x, y, dir, "position");
dstBeing->setTileCoords(x, y);
dstBeing->setDirection(dir);
@@ -641,7 +643,10 @@ void BeingRecv::processPlayerMove(Net::MessageIn &msg)
}
localPlayer->imitateOutfit(dstBeing, -1);
- uint16_t srcX, srcY, dstX, dstY;
+ uint16_t srcX;
+ uint16_t srcY;
+ uint16_t dstX;
+ uint16_t dstY;
msg.readCoordinatePair(srcX, srcY, dstX, dstY, "moving path");
localPlayer->followMoveTo(dstBeing, srcX, srcY, dstX, dstY);
@@ -875,7 +880,8 @@ void BeingRecv::processBeingVisible(Net::MessageIn &msg)
}
uint8_t dir;
- uint16_t x, y;
+ uint16_t x;
+ uint16_t y;
msg.readCoordinates(x, y, dir, "position");
dstBeing->setTileCoords(x, y);
@@ -1083,7 +1089,10 @@ void BeingRecv::processBeingMove(Net::MessageIn &msg)
setServerGender(dstBeing, gender);
}
- uint16_t srcX, srcY, dstX, dstY;
+ uint16_t srcX;
+ uint16_t srcY;
+ uint16_t dstX;
+ uint16_t dstY;
msg.readCoordinatePair(srcX, srcY, dstX, dstY, "move path");
if (disguiseId == 0)
{
@@ -1187,7 +1196,10 @@ void BeingRecv::processBeingMove2(Net::MessageIn &msg)
return;
}
- uint16_t srcX, srcY, dstX, dstY;
+ uint16_t srcX;
+ uint16_t srcY;
+ uint16_t dstX;
+ uint16_t dstY;
msg.readCoordinatePair(srcX, srcY, dstX, dstY, "move path");
msg.readInt32("tick");
diff --git a/src/net/tmwa/gamerecv.cpp b/src/net/tmwa/gamerecv.cpp
index c1b1c399a..76c2e6bfa 100644
--- a/src/net/tmwa/gamerecv.cpp
+++ b/src/net/tmwa/gamerecv.cpp
@@ -41,7 +41,8 @@ extern ServerInfo mapServer;
void GameRecv::processMapLogin(Net::MessageIn &msg)
{
unsigned char direction;
- uint16_t x, y;
+ uint16_t x;
+ uint16_t y;
msg.readInt32("tick");
msg.readCoordinates(x, y, direction, "position");
msg.readInt16("unknown?");
diff --git a/src/net/tmwa/playerrecv.cpp b/src/net/tmwa/playerrecv.cpp
index 8cb0bbc5d..844297b92 100644
--- a/src/net/tmwa/playerrecv.cpp
+++ b/src/net/tmwa/playerrecv.cpp
@@ -173,7 +173,10 @@ void PlayerRecv::processWalkResponse(Net::MessageIn &msg)
* and that the server will send a correction notice
* otherwise.
*/
- uint16_t srcX, srcY, dstX, dstY;
+ uint16_t srcX;
+ uint16_t srcY;
+ uint16_t dstX;
+ uint16_t dstY;
msg.readInt32("tick");
msg.readCoordinatePair(srcX, srcY, dstX, dstY, "move path");
msg.readUInt8("unused");
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-02 06:29:50 +0000