summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-14 16:53:50 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-14 16:53:50 +0300
commited4d2c347cd5ab591ebbfe2d87a90cd0f34d7c3a (patch)
treeaae2e44560c693cea69dbddbc565f9d76d02474b
parentda98d12637db106b87341560cc72ca6207b2d12f (diff)
downloadmanaplus-ed4d2c347cd5ab591ebbfe2d87a90cd0f34d7c3a.tar.gz
manaplus-ed4d2c347cd5ab591ebbfe2d87a90cd0f34d7c3a.tar.bz2
manaplus-ed4d2c347cd5ab591ebbfe2d87a90cd0f34d7c3a.tar.xz
manaplus-ed4d2c347cd5ab591ebbfe2d87a90cd0f34d7c3a.zip
Fix compilation warnings.
-rw-r--r--src/net/eathena/chathandler.cpp2
-rw-r--r--src/net/eathena/inventoryhandler.cpp2
-rw-r--r--src/utils/stringutils.h2
3 files changed, 1 insertions, 5 deletions
diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp
index 0dc632252..3b5df895e 100644
--- a/src/net/eathena/chathandler.cpp
+++ b/src/net/eathena/chathandler.cpp
@@ -379,8 +379,6 @@ void ChatHandler::processGmChat(Net::MessageIn &msg)
if (!findCutFirst(chatMsg, "ssss"))
findCutFirst(chatMsg, "eulb");
- const size_t pos = chatMsg.find(" : ", 0);
-
if (chatWindow)
chatWindow->addGlobalMessage(chatMsg);
BLOCK_END("ChatHandler::processChat")
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index 646ecef97..7666825de 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -427,8 +427,6 @@ void InventoryHandler::processPlayerInventory(Net::MessageIn &msg)
void InventoryHandler::processPlayerStorage(Net::MessageIn &msg)
{
BLOCK_START("InventoryHandler::processPlayerInventory")
- Inventory *const inventory = localPlayer
- ? PlayerInfo::getInventory() : nullptr;
mInventoryItems.clear();
msg.readInt16("len");
diff --git a/src/utils/stringutils.h b/src/utils/stringutils.h
index caf3869e0..25dcf9a9d 100644
--- a/src/utils/stringutils.h
+++ b/src/utils/stringutils.h
@@ -219,7 +219,7 @@ bool findCutLast(std::string &restrict str1,
const std::string &restrict str2) A_WARN_UNUSED;
bool findCutFirst(std::string &restrict str1,
- const std::string &restrict str2) A_WARN_UNUSED;
+ const std::string &restrict str2);
std::string &removeProtocol(std::string &url);