summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-06-28 02:39:27 +0300
committerAndrei Karas <akaras@inbox.ru>2012-06-28 02:39:27 +0300
commit6207ffb9a38c7e3718b7c4d87500ea9360d4d44f (patch)
tree8b87f43bb62ef9254cfd5e3ef2f344b1680fb760 /src
parent574181b2e5dfff30a2d4f766492226ab7b5a5a17 (diff)
downloadmv-6207ffb9a38c7e3718b7c4d87500ea9360d4d44f.tar.gz
mv-6207ffb9a38c7e3718b7c4d87500ea9360d4d44f.tar.bz2
mv-6207ffb9a38c7e3718b7c4d87500ea9360d4d44f.tar.xz
mv-6207ffb9a38c7e3718b7c4d87500ea9360d4d44f.zip
Fix compilation warnings.
Diffstat (limited to 'src')
-rw-r--r--src/map.cpp2
-rw-r--r--src/net/eathena/beinghandler.cpp9
-rw-r--r--src/net/eathena/npchandler.cpp2
3 files changed, 5 insertions, 8 deletions
diff --git a/src/map.cpp b/src/map.cpp
index f252308b6..9f4805239 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -660,7 +660,7 @@ bool Map::getWalk(int x, int y, unsigned char walkmask) const
return !(mMetaTiles[x + y * mWidth].blockmask & walkmask);
}
-void Map::setWalk(int x, int y, bool walkable)
+void Map::setWalk(int x, int y, bool walkable A_UNUSED)
{
blockTile(x, y, Map::BLOCKTYPE_GROUNDTOP);
}
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index 519681009..799282d59 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -442,8 +442,6 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, int msgType)
int guild;
Being *dstBeing;
int hairStyle, hairColor;
- unsigned char colors[9];
-
// An update about a player, potentially including movement.
int id = msg.readInt32();
@@ -495,10 +493,9 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, int msgType)
headMid = msg.readInt16();
hairColor = msg.readInt16();
- colors[0] = msg.readInt8();
- colors[1] = msg.readInt8();
- colors[2] = msg.readInt8();
-
+ msg.readInt8();
+ msg.readInt8();
+ msg.readInt8();
msg.readInt8(); //unused
// shoes = msg.readInt16();
// gloves = msg.readInt16(); //sd->head_dir
diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp
index 5562c51bf..c68dd35fd 100644
--- a/src/net/eathena/npchandler.cpp
+++ b/src/net/eathena/npchandler.cpp
@@ -181,7 +181,7 @@ void NpcHandler::sell(int beingId)
}
void NpcHandler::buyItem(int beingId A_UNUSED, int itemId,
- unsigned char color, int amount)
+ unsigned char color A_UNUSED, int amount)
{
MessageOut outMsg(CMSG_NPC_BUY_REQUEST);
outMsg.writeInt16(8); // One item (length of packet)