diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2020-08-04 17:03:26 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-01-26 14:36:42 +0100 |
| commit | fa8ab6eb98395ed468046c261fe120082d4e019b (patch) | |
| tree | 333571676b0dd323744154b86167fce5d184e851 /src/server | |
| parent | 41fe9a84d499a56e2631e20970d33367d7585391 (diff) | |
Core/Common: Move old-style pointer+size HexStr methods to Trinity::Impl where they can't hurt anyone
(cherry picked from commit 7b8b999516a824b0c417631a77f133eb47b8b2f4)
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/shared/Realm/RealmList.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 7393dbbe390..1b6fcf48ce1 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -3192,7 +3192,7 @@ bool ConditionMgr::IsPlayerMeetingCondition(Player const* player, PlayerConditio ByteBuffer HexToBytes(const std::string& hex) { ByteBuffer buffer(hex.length() / 2, ByteBuffer::Resize{}); - HexStrToByteArray(hex, buffer.contents()); + Trinity::Impl::HexStrToByteArray(hex, buffer.contents(), buffer.size()); return buffer; } diff --git a/src/server/shared/Realm/RealmList.cpp b/src/server/shared/Realm/RealmList.cpp index 1f1cd6326f0..4442857dc3d 100644 --- a/src/server/shared/Realm/RealmList.cpp +++ b/src/server/shared/Realm/RealmList.cpp @@ -82,11 +82,11 @@ void RealmList::LoadBuildInfo() build.Build = fields[4].GetUInt32(); std::string win64AuthSeedHexStr = fields[5].GetString(); if (win64AuthSeedHexStr.length() == build.Win64AuthSeed.size() * 2) - HexStrToByteArray(win64AuthSeedHexStr, build.Win64AuthSeed.data()); + HexStrToByteArray(win64AuthSeedHexStr, build.Win64AuthSeed); std::string mac64AuthSeedHexStr = fields[6].GetString(); if (mac64AuthSeedHexStr.length() == build.Mac64AuthSeed.size() * 2) - HexStrToByteArray(mac64AuthSeedHexStr, build.Mac64AuthSeed.data()); + HexStrToByteArray(mac64AuthSeedHexStr, build.Mac64AuthSeed); } while (result->NextRow()); } |
