summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-03-31 16:54:22 +0300
committerAndrei Karas <akaras@inbox.ru>2012-04-01 03:56:16 +0300
commit761682b6254a3d43e65ff45e07683c61afa6f1e4 (patch)
tree2ee462840f3aadb1e96bfa5c6784ec2cc0d2861a /src/net
parenta39f63cdfa5ce15b22f294a8bb1db3a036ce462d (diff)
downloadmanaplus-761682b6254a3d43e65ff45e07683c61afa6f1e4.tar.gz
manaplus-761682b6254a3d43e65ff45e07683c61afa6f1e4.tar.bz2
manaplus-761682b6254a3d43e65ff45e07683c61afa6f1e4.tar.xz
manaplus-761682b6254a3d43e65ff45e07683c61afa6f1e4.zip
Last part of fixes.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/ea/chathandler.cpp4
-rw-r--r--src/net/ea/guildhandler.cpp2
-rw-r--r--src/net/tmwa/chathandler.cpp4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index e31f68596..d44830644 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -265,7 +265,7 @@ void ChatHandler::processBeingChat(Net::MessageIn &msg)
if (being->getType() == Being::PLAYER)
being->setTalkTime();
- std::string::size_type pos = chatMsg.find(" : ", 0);
+ size_t pos = chatMsg.find(" : ", 0);
std::string sender_name = ((pos == std::string::npos)
? "" : chatMsg.substr(0, pos));
@@ -306,7 +306,7 @@ void ChatHandler::processChat(Net::MessageIn &msg, bool normalChat)
return;
std::string chatMsg = msg.readRawString(chatMsgLength);
- std::string::size_type pos = chatMsg.find(" : ", 0);
+ size_t pos = chatMsg.find(" : ", 0);
if (normalChat)
{
diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp
index 88bf65d67..75fc5af56 100644
--- a/src/net/ea/guildhandler.cpp
+++ b/src/net/ea/guildhandler.cpp
@@ -546,7 +546,7 @@ void GuildHandler::processGuildMessage(Net::MessageIn &msg)
{
std::string chatMsg = msg.readString(msgLength);
- std::string::size_type pos = chatMsg.find(" : ", 0);
+ size_t pos = chatMsg.find(" : ", 0);
if (pos != std::string::npos)
{
std::string sender_name = ((pos == std::string::npos)
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index 2323631cb..b3bf8b536 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -150,7 +150,7 @@ void ChatHandler::sendRaw(const std::string &args)
if (line == "")
return;
- std::string::size_type pos = line.find(" ");
+ size_t pos = line.find(" ");
if (pos != std::string::npos)
{
str = line.substr(0, pos);
@@ -179,7 +179,7 @@ void ChatHandler::sendRaw(const std::string &args)
void ChatHandler::processRaw(MessageOut &outMsg, std::string &line)
{
- std::string::size_type pos = line.find(":");
+ size_t pos = line.find(":");
if (pos == std::string::npos)
{
int i = atoi(line.c_str());