summaryrefslogtreecommitdiff
path: root/src/net/tmwa
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-11-05 01:09:30 +0300
committerAndrei Karas <akaras@inbox.ru>2018-11-05 01:09:30 +0300
commit485e9bb12bf5dda318ac0ccbf1d2a1cd86cf8c70 (patch)
treece74f5a2fb646439cb58c2d85bc67ff29b70dbb7 /src/net/tmwa
parent33f4a30373c8978d4e4f29422a5b0132fd14a0ec (diff)
downloadmanaverse-485e9bb12bf5dda318ac0ccbf1d2a1cd86cf8c70.tar.gz
manaverse-485e9bb12bf5dda318ac0ccbf1d2a1cd86cf8c70.tar.bz2
manaverse-485e9bb12bf5dda318ac0ccbf1d2a1cd86cf8c70.tar.xz
manaverse-485e9bb12bf5dda318ac0ccbf1d2a1cd86cf8c70.zip
Fix code style.
Diffstat (limited to 'src/net/tmwa')
-rw-r--r--src/net/tmwa/beingrecv.cpp24
-rw-r--r--src/net/tmwa/gamerecv.cpp3
-rw-r--r--src/net/tmwa/playerrecv.cpp5
3 files changed, 24 insertions, 8 deletions
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");