summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-12-28 18:57:17 +0300
committerAndrei Karas <akaras@inbox.ru>2014-12-28 18:57:17 +0300
commit8bfdc250ae7c5ab852653b3aa2da7f3781c7c56e (patch)
tree32d1116cc566bf0903d88f3db74d40482b30d05b
parentb4b262d0d6f66b1d84ef76f6c977768d013db2f1 (diff)
downloadplus-8bfdc250ae7c5ab852653b3aa2da7f3781c7c56e.tar.gz
plus-8bfdc250ae7c5ab852653b3aa2da7f3781c7c56e.tar.bz2
plus-8bfdc250ae7c5ab852653b3aa2da7f3781c7c56e.tar.xz
plus-8bfdc250ae7c5ab852653b3aa2da7f3781c7c56e.zip
Use as separator coma char for internal pet moving packet.
-rw-r--r--src/net/tmwa/pethandler.cpp2
-rw-r--r--src/utils/stringutils.cpp4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/net/tmwa/pethandler.cpp b/src/net/tmwa/pethandler.cpp
index 917f3a162..787b288b5 100644
--- a/src/net/tmwa/pethandler.cpp
+++ b/src/net/tmwa/pethandler.cpp
@@ -55,7 +55,7 @@ void PetHandler::handleMessage(Net::MessageIn &msg A_UNUSED)
void PetHandler::move(const int petId A_UNUSED,
const int x, const int y) const
{
- chatHandler->talk(strprintf("\302\202\302m%d %dg%d",
+ chatHandler->talk(strprintf("\302\202\302m%d,%dg%d",
x, y, tick_time), GENERAL_CHANNEL);
}
diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp
index 8af8ea547..3aa3cee02 100644
--- a/src/utils/stringutils.cpp
+++ b/src/utils/stringutils.cpp
@@ -734,7 +734,9 @@ void secureChatCommand(std::string &str)
bool parse2Int(const std::string &args, int &x, int &y)
{
bool isValid = false;
- const size_t pos = args.find(" ");
+ size_t pos = args.find(" ");
+ if (pos == std::string::npos)
+ pos = args.find(",");
if (pos != std::string::npos)
{
if (pos + 1 < args.length())