From 608dfae22e1b5145210314ca6c7268420dd639c8 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 10 Dec 2016 16:46:55 +0300 Subject: Fix some issues found by automatic checks. --- src/net/download.cpp | 2 +- src/net/ea/gamehandler.cpp | 2 +- src/net/ea/playerrecv.cpp | 2 +- src/net/eathena/chathandler.cpp | 6 +++--- src/net/tmwa/chathandler.cpp | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/net') diff --git a/src/net/download.cpp b/src/net/download.cpp index 3844cc01f..570007cea 100644 --- a/src/net/download.cpp +++ b/src/net/download.cpp @@ -92,7 +92,7 @@ Download::Download(void *const ptr, const std::string serverName = settings.serverName; if (!serverName.empty()) { - if (mUrl.find("?") == std::string::npos) + if (mUrl.find('?') == std::string::npos) mUrl.append("?host="); else mUrl.append("&host="); diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp index 397e10a29..5e5fe01d3 100644 --- a/src/net/ea/gamehandler.cpp +++ b/src/net/ea/gamehandler.cpp @@ -44,7 +44,7 @@ void GameHandler::who() const void GameHandler::setMap(const std::string &map) { - GameRecv::mMap = map.substr(0, map.rfind(".")); + GameRecv::mMap = map.substr(0, map.rfind('.')); } void GameHandler::clear() const diff --git a/src/net/ea/playerrecv.cpp b/src/net/ea/playerrecv.cpp index 92b151b21..6503b9f3c 100644 --- a/src/net/ea/playerrecv.cpp +++ b/src/net/ea/playerrecv.cpp @@ -85,7 +85,7 @@ void PlayerRecv::processPlayerWarp(Net::MessageIn &msg) const bool sameMap = (currentMapName == mapPath); // Switch the actual map, deleting the previous one if necessary - mapPath = mapPath.substr(0, mapPath.rfind(".")); + mapPath = mapPath.substr(0, mapPath.rfind('.')); game->changeMap(mapPath); int scrollOffsetX = 0; diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp index bbfc1af3e..349777136 100644 --- a/src/net/eathena/chathandler.cpp +++ b/src/net/eathena/chathandler.cpp @@ -120,7 +120,7 @@ void ChatHandler::sendRaw(const std::string &args) const if (line.empty()) return; - size_t pos = line.find(" "); + size_t pos = line.find(' '); if (pos != std::string::npos) { str = line.substr(0, pos); @@ -129,7 +129,7 @@ void ChatHandler::sendRaw(const std::string &args) const outMsg = new MessageOut(id); outMsg->writeInt16(id, "packet id"); line = line.substr(pos + 1); - pos = line.find(" "); + pos = line.find(' '); } else { @@ -145,7 +145,7 @@ void ChatHandler::sendRaw(const std::string &args) const str = line.substr(0, pos); processRaw(*outMsg, str); line = line.substr(pos + 1); - pos = line.find(" "); + pos = line.find(' '); } if (!line.empty()) processRaw(*outMsg, line); diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp index c372e4305..766e32108 100644 --- a/src/net/tmwa/chathandler.cpp +++ b/src/net/tmwa/chathandler.cpp @@ -118,7 +118,7 @@ void ChatHandler::sendRaw(const std::string &args) const if (line.empty()) return; - size_t pos = line.find(" "); + size_t pos = line.find(' '); if (pos != std::string::npos) { str = line.substr(0, pos); @@ -126,7 +126,7 @@ void ChatHandler::sendRaw(const std::string &args) const outMsg = new MessageOut(id); outMsg->writeInt16(id, "packet id"); line = line.substr(pos + 1); - pos = line.find(" "); + pos = line.find(' '); } else { @@ -142,7 +142,7 @@ void ChatHandler::sendRaw(const std::string &args) const str = line.substr(0, pos); processRaw(*outMsg, str); line = line.substr(pos + 1); - pos = line.find(" "); + pos = line.find(' '); } if (!line.empty()) processRaw(*outMsg, line); -- cgit v1.2.3-60-g2f50