diff options
| author | Shauren <shauren.trinity@gmail.com> | 2023-05-13 15:46:27 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2023-05-13 15:46:27 +0200 |
| commit | 3260b94dd627b7b0c7114f94bb97d108b005af3e (patch) | |
| tree | 980d58d6db4a3d20785f8bca881d36f79d0f5755 /src/server/game/Tools/PlayerDump.cpp | |
| parent | c4d40085964109893c76d301b6f7d99f03838fa0 (diff) | |
Core/Misc: Replace string to int conversion functions from Common.h with c++17 std::from_chars based ones Trinity::StringTo
Diffstat (limited to 'src/server/game/Tools/PlayerDump.cpp')
| -rw-r--r-- | src/server/game/Tools/PlayerDump.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/server/game/Tools/PlayerDump.cpp b/src/server/game/Tools/PlayerDump.cpp index 0eabe462431..5fe16403faa 100644 --- a/src/server/game/Tools/PlayerDump.cpp +++ b/src/server/game/Tools/PlayerDump.cpp @@ -23,6 +23,7 @@ #include "Log.h" #include "ObjectMgr.h" #include "Player.h" +#include "StringConvert.h" #include "World.h" #include <boost/algorithm/string/find.hpp> #include <fstream> @@ -592,7 +593,7 @@ inline T RegisterNewGuid(T oldGuid, MapType<T, T, Rest...>& guidMap, T guidOffse template <typename T, template<class, class, class...> class MapType, class... Rest> inline bool ChangeGuid(TableStruct const& ts, std::string& str, std::string const& column, MapType<T, T, Rest...>& guidMap, T guidOffset, bool allowZero = false) { - T oldGuid(atoull(GetColumn(ts, str, column).c_str())); + T oldGuid = Trinity::StringTo<T>(GetColumn(ts, str, column)).template value_or<T>(0); if (allowZero && !oldGuid) return true; // not an error @@ -1015,10 +1016,10 @@ DumpReturn PlayerDumpReader::LoadDump(std::istream& input, uint32 account, std:: { case DTT_CHARACTER: { - race = uint8(atoul(GetColumn(ts, line, "race").c_str())); - playerClass = uint8(atoul(GetColumn(ts, line, "class").c_str())); - gender = uint8(atoul(GetColumn(ts, line, "gender").c_str())); - level = uint8(atoul(GetColumn(ts, line, "level").c_str())); + race = Trinity::StringTo<uint8>(GetColumn(ts, line, "race")).value_or<uint8>(0); + playerClass = Trinity::StringTo<uint8>(GetColumn(ts, line, "class")).value_or<uint8>(0); + gender = Trinity::StringTo<uint8>(GetColumn(ts, line, "gender")).value_or<uint8>(0); + level = Trinity::StringTo<uint8>(GetColumn(ts, line, "level")).value_or<uint8>(0); if (name.empty()) { // generate a temporary name |