summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-08-19 23:10:19 +0300
committerAndrei Karas <akaras@inbox.ru>2012-08-19 23:10:19 +0300
commitbdd2a88890ea7819371047fa53eeca87209147d0 (patch)
tree95dcb4401bcb29ac0c043ecd278c4f1b8f3308dc
parent78982d2707fc8db243cc29448c411a52b5aeeffb (diff)
downloadmv-bdd2a88890ea7819371047fa53eeca87209147d0.tar.gz
mv-bdd2a88890ea7819371047fa53eeca87209147d0.tar.bz2
mv-bdd2a88890ea7819371047fa53eeca87209147d0.tar.xz
mv-bdd2a88890ea7819371047fa53eeca87209147d0.zip
Fix compilation warnings.
-rw-r--r--src/net/eathena/network.cpp7
-rw-r--r--src/net/tmwa/network.cpp5
2 files changed, 9 insertions, 3 deletions
diff --git a/src/net/eathena/network.cpp b/src/net/eathena/network.cpp
index 5cfe0af1a..67018e7b5 100644
--- a/src/net/eathena/network.cpp
+++ b/src/net/eathena/network.cpp
@@ -218,7 +218,7 @@ MessageIn Network::getNextMessage()
SDL_mutexP(mMutex);
int msgId = readWord(0);
- int len;
+ int len = -1;
if (msgId == SMSG_SERVER_VERSION_RESPONSE)
{
len = 10;
@@ -229,8 +229,11 @@ MessageIn Network::getNextMessage()
}
else
{
- if (msgId >= 0 && msgId < sizeof(packet_lengths) / sizeof (short))
+ if (msgId >= 0 && msgId < static_cast<signed>(
+ sizeof(packet_lengths) / sizeof (short)))
+ {
len = packet_lengths[msgId];
+ }
}
if (len == -1)
diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp
index 98f6485a7..0492f6609 100644
--- a/src/net/tmwa/network.cpp
+++ b/src/net/tmwa/network.cpp
@@ -179,8 +179,11 @@ bool Network::messageReady()
}
else
{
- if (msgId >= 0 && msgId < sizeof(packet_lengths) / sizeof (short))
+ if (msgId >= 0 && msgId < static_cast<signed>(
+ sizeof(packet_lengths) / sizeof (short)))
+ {
len = packet_lengths[msgId];
+ }
}
if (len == -1 && mInSize > 4)