diff options
| author | Subv <s.v.h21@hotmail.com> | 2012-10-04 19:39:09 -0500 |
|---|---|---|
| committer | Subv <s.v.h21@hotmail.com> | 2012-10-04 19:39:09 -0500 |
| commit | f7d3600e7e7ffaba971b77e4371a705e55593cfd (patch) | |
| tree | 2d4e898bb4e09ede5dba97918741597da6fd2d2e /src/server/game/Accounts/AccountMgr.cpp | |
| parent | d2437407f4f7ad1af3baeb351626b41bd700065c (diff) | |
| parent | 74707a08d3d63dc66e7b6943431c91f50258b0f9 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
Diffstat (limited to 'src/server/game/Accounts/AccountMgr.cpp')
| -rwxr-xr-x | src/server/game/Accounts/AccountMgr.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/server/game/Accounts/AccountMgr.cpp b/src/server/game/Accounts/AccountMgr.cpp index 8076f800356..b666add74b3 100755 --- a/src/server/game/Accounts/AccountMgr.cpp +++ b/src/server/game/Accounts/AccountMgr.cpp @@ -16,8 +16,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "DatabaseEnv.h" #include "AccountMgr.h" +#include "DatabaseEnv.h" #include "ObjectAccessor.h" #include "Player.h" #include "Util.h" @@ -274,10 +274,7 @@ std::string CalculateShaPassHash(std::string& name, std::string& password) sha.UpdateData(password); sha.Finalize(); - std::string encoded; - hexEncodeByteArray(sha.GetDigest(), sha.GetLength(), encoded); - - return encoded; + return ByteArrayToHexStr(sha.GetDigest(), sha.GetLength()); } bool IsPlayerAccount(uint32 gmlevel) |