summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-02 23:30:27 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-06 01:18:56 +0300
commit19f03b283367a95e3ffb7ef63049fd2992352aab (patch)
treeb1374f28350cb123a0159c87d1c5aecd147eac69
parentf32c27a3446fc8312a7fd4f9a85b60720549582a (diff)
downloadManaVerse-19f03b283367a95e3ffb7ef63049fd2992352aab.tar.gz
ManaVerse-19f03b283367a95e3ffb7ef63049fd2992352aab.tar.bz2
ManaVerse-19f03b283367a95e3ffb7ef63049fd2992352aab.tar.xz
ManaVerse-19f03b283367a95e3ffb7ef63049fd2992352aab.zip
fix compilation warnings
-rw-r--r--src/net/eathena/beinghandler.cpp2
-rw-r--r--src/net/eathena/charserverhandler.cpp2
-rw-r--r--src/net/eathena/chathandler.cpp2
-rw-r--r--src/net/eathena/inventoryhandler.cpp4
4 files changed, 5 insertions, 5 deletions
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index 96cb87ab7..228e2ce6a 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -640,7 +640,7 @@ void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg)
if (visible)
{
- const int len = msg.readInt16("len");
+ msg.readInt16("len");
msg.readUInt8("object type");
}
diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp
index 75a8245c0..a7f6fea68 100644
--- a/src/net/eathena/charserverhandler.cpp
+++ b/src/net/eathena/charserverhandler.cpp
@@ -417,7 +417,7 @@ void CharServerHandler::processPincodeStatus(Net::MessageIn &msg)
}
}
-void CharServerHandler::setNewPincode(const std::string &pin)
+void CharServerHandler::setNewPincode(const std::string &pin A_UNUSED)
{
// here need ecript pin with mPinSeed and pin values.
diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp
index e94bbe874..1a5006166 100644
--- a/src/net/eathena/chathandler.cpp
+++ b/src/net/eathena/chathandler.cpp
@@ -300,7 +300,7 @@ void ChatHandler::processChat(Net::MessageIn &msg)
if (localPlayer)
{
- if (chatWindow || mShowMotd)
+ if ((chatWindow || mShowMotd) && allow)
localPlayer->setSpeech(chatMsg, GENERAL_CHANNEL);
}
}
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index b1b787911..607a0717c 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -223,7 +223,7 @@ void InventoryHandler::processPlayerEquipment(Net::MessageIn &msg)
{
const int index = msg.readInt16("index") - INVENTORY_OFFSET;
const int itemId = msg.readInt16("item id");
- const uint8_t itemType = msg.readUInt8("item type");
+ msg.readUInt8("item type");
// uint8_t identified = msg.readUInt8(); // identify flag
msg.readInt32("location");
@@ -236,7 +236,7 @@ void InventoryHandler::processPlayerEquipment(Net::MessageIn &msg)
msg.readInt32("hire expire date (?)");
const int equipType = msg.readInt16("equip type");
msg.readInt16("item sprite number");
- const uint8_t flags = static_cast<uint8_t>(msg.readInt8("flags"));
+ msg.readInt8("flags");
// need get actual identify flag
uint8_t identified = 1;