Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps

Conflicts:
	dep/PackageList.txt
	src/server/game/Movement/MotionMaster.cpp
	src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
	src/server/game/Movement/Spline/MoveSplineInit.h
	src/server/game/World/World.h

1 files changed, 24 insertions, 18 deletions

diff --git a/src/server/shared/Cryptography/WardenKeyGeneration.h b/src/server/shared/Cryptography/WardenKeyGeneration.h
index 9b44ab1832e..f0a9905b6fe 100644
--- a/src/server/shared/Cryptography/WardenKeyGeneration.h
+++ b/src/server/shared/Cryptography/WardenKeyGeneration.h
@@ -21,50 +21,56 @@
 #ifndef _WARDEN_KEY_GENERATION_H
 #define _WARDEN_KEY_GENERATION_H
 
-class SHA1Randx {
+class SHA1Randx
+{
 public:
-    SHA1Randx(uint8 *buff, uint32 size) {
+    SHA1Randx(uint8* buff, uint32 size)
+    {
         uint32 taken = size/2;
 
         sh.Initialize();
-        sh.UpdateData(buff,taken);
+        sh.UpdateData(buff, taken);
         sh.Finalize();
 
-        memcpy(o1,sh.GetDigest(),20);
+        memcpy(o1, sh.GetDigest(), 20);
 
         sh.Initialize();
-        sh.UpdateData(buff+taken,size-taken);
+        sh.UpdateData(buff + taken, size - taken);
         sh.Finalize();
 
-        memcpy(o2,sh.GetDigest(),20);
+        memcpy(o2, sh.GetDigest(), 20);
 
-        memset(o0,0x00,20);
+        memset(o0, 0x00, 20);
 
-        fillUp();
+        FillUp();
     }
 
-    void generate(uint8 *buf, uint32 sz) {
-        for(uint32 i=0;i<sz;i++) {
-            if(taken == 20) {
-                fillUp();
-            }
+    void Generate(uint8* buf, uint32 sz)
+    {
+        for (uint32 i = 0; i < sz; ++i)
+        {
+            if (taken == 20)
+                FillUp();
 
             buf[i] = o0[taken];
             taken++;
         }
     }
+
 private:
-    void fillUp() {
+    void FillUp()
+    {
         sh.Initialize();
-        sh.UpdateData(o1,20);
-        sh.UpdateData(o0,20);
-        sh.UpdateData(o2,20);
+        sh.UpdateData(o1, 20);
+        sh.UpdateData(o0, 20);
+        sh.UpdateData(o2, 20);
         sh.Finalize();
 
-        memcpy(o0,sh.GetDigest(),20);
+        memcpy(o0, sh.GetDigest(), 20);
 
         taken = 0;
     }
+
     SHA1Hash sh;
     uint32 taken;
     uint8 o0[20],o1[20],o2[20];