diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-09-08 19:39:32 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-09-08 19:39:32 +0300 |
| commit | 571ff6e1401876cb775b827f6af25e14b1f59c6f (patch) | |
| tree | 4cf36adcda2779a40f1f1f9a46b7a787f2834782 /src/utils | |
| parent | 15e87a84d62cc0b0077b25c235824879bde66a41 (diff) | |
| download | manaplus-571ff6e1401876cb775b827f6af25e14b1f59c6f.tar.gz manaplus-571ff6e1401876cb775b827f6af25e14b1f59c6f.tar.bz2 manaplus-571ff6e1401876cb775b827f6af25e14b1f59c6f.tar.xz manaplus-571ff6e1401876cb775b827f6af25e14b1f59c6f.zip | |
Improve string to int parsing.
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/stringutils.cpp | 15 | ||||
| -rw-r--r-- | src/utils/stringutils.h | 2 |
2 files changed, 17 insertions, 0 deletions
diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp index 11143206e..5674abfd9 100644 --- a/src/utils/stringutils.cpp +++ b/src/utils/stringutils.cpp @@ -746,3 +746,18 @@ bool parse2Int(const std::string &args, int &x, int &y) } return isValid; } + +int parseNumber(const std::string &str) +{ + int i = 0; + 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()); + return i; +} diff --git a/src/utils/stringutils.h b/src/utils/stringutils.h index 5cf685a89..cf729c345 100644 --- a/src/utils/stringutils.h +++ b/src/utils/stringutils.h @@ -240,4 +240,6 @@ void secureChatCommand(std::string &str); bool parse2Int(const std::string &args, int &x, int &y); +int parseNumber(const std::string &str); + #endif // UTILS_STRINGUTILS_H |