diff options
Diffstat (limited to 'src/server/shared/Utilities')
| -rw-r--r-- | src/server/shared/Utilities/Util.cpp | 6 | ||||
| -rw-r--r-- | src/server/shared/Utilities/Util.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp index 1bba3c2db09..32ff396e1c1 100644 --- a/src/server/shared/Utilities/Util.cpp +++ b/src/server/shared/Utilities/Util.cpp @@ -150,9 +150,9 @@ std::string secsToTimeString(uint64 timeInSecs, bool shortText, bool hoursOnly) return ss.str(); } -int32 MoneyStringToMoney(const std::string& moneyString) +int64 MoneyStringToMoney(const std::string& moneyString) { - int32 money = 0; + int64 money = 0; if (!(std::count(moneyString.begin(), moneyString.end(), 'g') == 1 || std::count(moneyString.begin(), moneyString.end(), 's') == 1 || @@ -169,7 +169,7 @@ int32 MoneyStringToMoney(const std::string& moneyString) if (gCount + sCount + cCount != 1) return 0; - uint32 amount = atoi(*itr); + uint64 amount = atol(*itr); if (gCount == 1) money += amount * 100 * 100; else if (sCount == 1) diff --git a/src/server/shared/Utilities/Util.h b/src/server/shared/Utilities/Util.h index a379bfd32fc..5d1ce862d21 100644 --- a/src/server/shared/Utilities/Util.h +++ b/src/server/shared/Utilities/Util.h @@ -67,7 +67,7 @@ private: void stripLineInvisibleChars(std::string &src); -int32 MoneyStringToMoney(const std::string& moneyString); +int64 MoneyStringToMoney(const std::string& moneyString); std::string secsToTimeString(uint64 timeInSecs, bool shortText = false, bool hoursOnly = false); uint32 TimeStringToSecs(const std::string& timestring); |