diff options
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/eathena/chathandler.cpp | 19 | ||||
| -rw-r--r-- | src/net/tmwa/chathandler.cpp | 19 |
2 files changed, 8 insertions, 30 deletions
diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp index eed77a52c..d55a93dbb 100644 --- a/src/net/eathena/chathandler.cpp +++ b/src/net/eathena/chathandler.cpp @@ -157,13 +157,13 @@ void ChatHandler::sendRaw(const std::string &args) const if (pos != std::string::npos) { str = line.substr(0, pos); - outMsg = new MessageOut(static_cast<int16_t>(atoi(str.c_str()))); + outMsg = new MessageOut(static_cast<int16_t>(parseNumber(str))); line = line.substr(pos + 1); pos = line.find(" "); } else { - outMsg = new MessageOut(static_cast<int16_t>(atoi(line.c_str()))); + outMsg = new MessageOut(static_cast<int16_t>(parseNumber(line))); delete outMsg; return; } @@ -186,19 +186,8 @@ void ChatHandler::processRaw(MessageOut &restrict outMsg, if (line.size() < 2) return; - char cmd = tolower(line[0]); - int i = 0; - std::string str = line.substr(1); - int idx = 0; - if (strStartWith(str, "0x")) - idx = 2; - else if (str[0] == 'h' || str[0] == 'x') - idx = 1; - if (idx > 0) - sscanf(str.substr(idx).c_str(), "%10x", &i); - else - i = atoi(str.c_str()); - switch (cmd) + const int i = parseNumber(line.substr(1)); + switch (tolower(line[0])) { case 'b': { diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp index 3976aa723..3648197eb 100644 --- a/src/net/tmwa/chathandler.cpp +++ b/src/net/tmwa/chathandler.cpp @@ -178,13 +178,13 @@ void ChatHandler::sendRaw(const std::string &args) const if (pos != std::string::npos) { str = line.substr(0, pos); - outMsg = new MessageOut(static_cast<int16_t>(atoi(str.c_str()))); + outMsg = new MessageOut(static_cast<int16_t>(parseNumber(str))); line = line.substr(pos + 1); pos = line.find(" "); } else { - outMsg = new MessageOut(static_cast<int16_t>(atoi(line.c_str()))); + outMsg = new MessageOut(static_cast<int16_t>(parseNumber(line))); delete outMsg; return; } @@ -207,19 +207,8 @@ void ChatHandler::processRaw(MessageOut &restrict outMsg, if (line.size() < 2) return; - char cmd = tolower(line[0]); - int i = 0; - std::string str = line.substr(1); - int idx = 0; - if (strStartWith(str, "0x")) - idx = 2; - else if (str[0] == 'h' || str[0] == 'x') - idx = 1; - if (idx > 0) - sscanf(str.substr(idx).c_str(), "%10x", &i); - else - i = atoi(str.c_str()); - switch (cmd) + int i = parseNumber(line.substr(1)); + switch (tolower(line[0])) { case 'b': { |