summaryrefslogtreecommitdiff
path: root/src/net/tmwa/beinghandler.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-09-09 22:10:53 +0300
committerAndrei Karas <akaras@inbox.ru>2011-09-09 22:11:30 +0300
commit703a3c4df3732e3e88559147001260f3355d42d6 (patch)
treefcaf8919cf734429374e4bb9a83b2b4a33835d1d /src/net/tmwa/beinghandler.cpp
parent3a875a0026936d4bcb3bd1c2b6e8ac547cd5e27e (diff)
downloadmv-703a3c4df3732e3e88559147001260f3355d42d6.tar.gz
mv-703a3c4df3732e3e88559147001260f3355d42d6.tar.bz2
mv-703a3c4df3732e3e88559147001260f3355d42d6.tar.xz
mv-703a3c4df3732e3e88559147001260f3355d42d6.zip
Continue fix for shadow variables/methods errors.
Diffstat (limited to 'src/net/tmwa/beinghandler.cpp')
-rw-r--r--src/net/tmwa/beinghandler.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index c087ab43d..845c30f19 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -445,7 +445,7 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, int msgType)
Being *dstBeing;
int hairStyle, hairColor;
unsigned char colors[9];
- Uint8 dir;
+
// An update about a player, potentially including movement.
int id = msg.readInt32();
@@ -469,7 +469,7 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, int msgType)
return;
}
- dir = dstBeing->getDirectionDelayed();
+ Uint8 dir = dstBeing->getDirectionDelayed();
if (dir)
{
if (dir != dstBeing->getDirection())
@@ -568,10 +568,10 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, int msgType)
if (srcX != dstX || srcY != dstY)
{
- int dir = dstBeing->calcDirection(dstX, dstY);
+ int d = dstBeing->calcDirection(dstX, dstY);
- if (dir && dstBeing->getDirection() != dir)
- dstBeing->setDirectionDelayed(static_cast<Uint8>(dir));
+ if (d && dstBeing->getDirection() != d)
+ dstBeing->setDirectionDelayed(static_cast<Uint8>(d));
}
if (player_node->getCurrentAction() != Being::STAND)
@@ -584,7 +584,7 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, int msgType)
}
else
{
- Uint8 dir;
+// Uint8 dir;
Uint16 x, y;
msg.readCoordinates(x, y, dir);
dstBeing->setTileCoords(x, y);