summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-06-20 20:05:12 +0300
committerAndrei Karas <akaras@inbox.ru>2015-06-20 20:05:12 +0300
commitb3ce0c32c6918eb7b3f50c8a1c0e57a6522bce82 (patch)
tree3071b6aec1de4df41f9159e7b27d9d1f42d5ba28 /src
parentd50ef0a41191beb164e9dddc87f6ffadea5b5cc8 (diff)
downloadmv-b3ce0c32c6918eb7b3f50c8a1c0e57a6522bce82.tar.gz
mv-b3ce0c32c6918eb7b3f50c8a1c0e57a6522bce82.tar.bz2
mv-b3ce0c32c6918eb7b3f50c8a1c0e57a6522bce82.tar.xz
mv-b3ce0c32c6918eb7b3f50c8a1c0e57a6522bce82.zip
Fix compilation warnings.
Diffstat (limited to 'src')
-rw-r--r--src/net/tmwa/beinghandler.cpp24
-rw-r--r--src/net/tmwa/charserverhandler.cpp4
-rw-r--r--src/net/tmwa/loginhandler.cpp6
-rw-r--r--src/net/tmwa/npchandler.cpp2
4 files changed, 9 insertions, 27 deletions
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index f5ebfd2f7..28c91fd28 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -483,13 +483,7 @@ void BeingHandler::processPlayerUpdate1(Net::MessageIn &msg)
const uint16_t headMid = msg.readInt16("head mid");
const uint8_t hairColor = msg.readUInt8("hair color");
msg.readUInt8("unused");
-
- uint8_t colors[9];
- colors[0] = msg.readUInt8("color 0");
- colors[1] = msg.readUInt8("color 1");
- colors[2] = msg.readUInt8("color 2");
-
- msg.readUInt8("unused");
+ msg.readInt32("unused");
const int guild = msg.readInt32("guild");
@@ -623,13 +617,7 @@ void BeingHandler::processPlayerUpdate2(Net::MessageIn &msg)
const uint16_t headMid = msg.readInt16("head mid");
const uint8_t hairColor = msg.readUInt8("hair color");
msg.readUInt8("unused");
-
- uint8_t colors[9];
- colors[0] = msg.readUInt8("color 0");
- colors[1] = msg.readUInt8("color 1");
- colors[2] = msg.readUInt8("color 2");
-
- msg.readUInt8("unused");
+ msg.readInt32("unused");
const int guild = msg.readInt32("guild");
@@ -763,13 +751,7 @@ void BeingHandler::processPlayerMove(Net::MessageIn &msg)
const uint16_t headMid = msg.readInt16("head mid");
const uint8_t hairColor = msg.readUInt8("hair color");
msg.readUInt8("unused");
-
- uint8_t colors[9];
- colors[0] = msg.readUInt8("color 0");
- colors[1] = msg.readUInt8("color 1");
- colors[2] = msg.readUInt8("color 2");
-
- msg.readUInt8("unused");
+ msg.readInt32("unused");
const int guild = msg.readInt32("guild");
diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index 7e0c2e988..4c6636727 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -254,8 +254,8 @@ void CharServerHandler::newCharacter(const std::string &name, const int slot,
const GenderT gender A_UNUSED,
const int hairstyle,
const int hairColor,
- const unsigned char race,
- const uint16_t look,
+ const unsigned char race A_UNUSED,
+ const uint16_t look A_UNUSED,
const std::vector<int> &stats) const
{
createOutPacket(CMSG_CHAR_CREATE);
diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp
index 58a0be565..c94a82327 100644
--- a/src/net/tmwa/loginhandler.cpp
+++ b/src/net/tmwa/loginhandler.cpp
@@ -173,9 +173,9 @@ void LoginHandler::requestUpdateHosts()
void LoginHandler::processServerVersion(Net::MessageIn &msg)
{
const uint8_t b1 = msg.readUInt8("b1"); // -1
- const uint8_t b2 = msg.readUInt8("b2"); // E
- const uint8_t b3 = msg.readUInt8("b3"); // V
- const uint8_t b4 = msg.readUInt8("b4"); // L
+ const uint8_t b2 = msg.readUInt8("b2");
+ const uint8_t b3 = msg.readUInt8("b3");
+ msg.readUInt8("b4");
if (b1 == 255)
{ // old TMWA
const unsigned int options = msg.readInt32("options");
diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp
index 7007a20f1..60d41a7ef 100644
--- a/src/net/tmwa/npchandler.cpp
+++ b/src/net/tmwa/npchandler.cpp
@@ -178,7 +178,7 @@ void NpcHandler::sell(const BeingId beingId) const
void NpcHandler::buyItem(const BeingId beingId A_UNUSED,
const int itemId,
- const unsigned char color,
+ const unsigned char color A_UNUSED,
const int amount) const
{
createOutPacket(CMSG_NPC_BUY_REQUEST);