Core/Battle.net:

* Changed packet structures to mirror client names
* Simplified ToString Building
* Removed deprecated structures

World: Cleaned up duplicate realm info 'realm' and 'realmHandle' variables (realmHandle was removed, that data is fully contained in realm)

2 files changed, 55 insertions, 20 deletions

diff --git a/src/server/bnetserver/Authentication/AuthCodes.cpp b/src/server/bnetserver/Authentication/AuthCodes.cpp
index 97723816ce3..a717263786e 100644
--- a/src/server/bnetserver/Authentication/AuthCodes.cpp
+++ b/src/server/bnetserver/Authentication/AuthCodes.cpp
@@ -16,34 +16,36 @@
  */
 
 #include "AuthCodes.h"
-#include <cstddef>
+#include "Define.h"
+#include <vector>
 
 namespace AuthHelper
 {
-    static RealmBuildInfo const PostBcAcceptedClientBuilds[] =
+    // List of client builds for verbose version info in realmlist packet
+    static std::vector<RealmBuildInfo> const ClientBuilds =
     {
-        {15595, 4, 3, 4, ' '},
-        {14545, 4, 2, 2, ' '},
-        {13623, 4, 0, 6, 'a'},
-        {13930, 3, 3, 5, 'a'},                                  // 3.3.5a China Mainland build
-        {12340, 3, 3, 5, 'a'},
-        {11723, 3, 3, 3, 'a'},
-        {11403, 3, 3, 2, ' '},
-        {11159, 3, 3, 0, 'a'},
-        {10505, 3, 2, 2, 'a'},
-        {9947,  3, 1, 3, ' '},
-        {8606,  2, 4, 3, ' '},
-        {6141,  1, 12, 3, ' '},
-        {6005,  1, 12, 2, ' '},
-        {5875,  1, 12, 1, ' '},
-        {0,     0, 0, 0, ' '}                                   // terminator
+        { 20490, 6, 2, 2, 'a' },
+        { 15595, 4, 3, 4, ' ' },
+        { 14545, 4, 2, 2, ' ' },
+        { 13623, 4, 0, 6, 'a' },
+        { 13930, 3, 3, 5, 'a' },                                  // 3.3.5a China Mainland build
+        { 12340, 3, 3, 5, 'a' },
+        { 11723, 3, 3, 3, 'a' },
+        { 11403, 3, 3, 2, ' ' },
+        { 11159, 3, 3, 0, 'a' },
+        { 10505, 3, 2, 2, 'a' },
+        { 9947,  3, 1, 3, ' ' },
+        { 8606,  2, 4, 3, ' ' },
+        { 6141,  1, 12, 3, ' ' },
+        { 6005,  1, 12, 2, ' ' },
+        { 5875,  1, 12, 1, ' ' },
     };
 
     RealmBuildInfo const* GetBuildInfo(int build)
     {
-        for (int i = 0; PostBcAcceptedClientBuilds[i].Build; ++i)
-            if (PostBcAcceptedClientBuilds[i].Build == build)
-                return &PostBcAcceptedClientBuilds[i];
+        for (int32 i = 0; ClientBuilds.size(); ++i)
+            if (ClientBuilds[i].Build == build)
+                return &ClientBuilds[i];
 
         return nullptr;
     }
diff --git a/src/server/bnetserver/Authentication/AuthCodes.h b/src/server/bnetserver/Authentication/AuthCodes.h
index e7b1582a6af..a217238fe59 100644
--- a/src/server/bnetserver/Authentication/AuthCodes.h
+++ b/src/server/bnetserver/Authentication/AuthCodes.h
@@ -109,6 +109,39 @@ namespace Battlenet
         LOGIN_INVALID_PAYMENT           = 219,
         LOGIN_INVALID_ACCOUNT_STATE     = 220
     };
+
+    namespace Wow
+    {
+        enum AuthResult
+        {
+            WOW_SUCCESS                 = 0,
+            WOW_FAIL_BANNED             = 3,
+            WOW_FAIL_UNKNOWN_ACCOUNT    = 4,
+            WOW_FAIL_INCORRECT_PASSWORD = 5,
+            WOW_FAIL_ALREADY_ONLINE     = 6,
+            WOW_FAIL_NO_TIME            = 7,
+            WOW_FAIL_DB_BUSY            = 8,
+            WOW_FAIL_VERSION_INVALID    = 9,
+            WOW_FAIL_VERSION_UPDATE     = 10,
+            WOW_FAIL_INVALID_SERVER     = 11,
+            WOW_FAIL_SUSPENDED          = 12,
+            WOW_FAIL_FAIL_NOACCESS      = 13,
+            WOW_SUCCESS_SURVEY          = 14,
+            WOW_FAIL_PARENTCONTROL      = 15,
+            WOW_FAIL_LOCKED_ENFORCED    = 16,
+            WOW_FAIL_TRIAL_ENDED        = 17,
+            WOW_FAIL_OVERMIND_CONVERTED = 18,
+            WOW_FAIL_ANTI_INDULGENCE    = 19,
+            WOW_FAIL_EXPIRED            = 20,
+            WOW_FAIL_NO_GAME_ACCOUNT    = 21,
+            WOW_FAIL_BILLING_LOCK       = 22,
+            WOW_FAIL_IGR_WITHOUT_BNET   = 23,
+            WOW_FAIL_AA_LOCK            = 24,
+            WOW_FAIL_UNLOCKABLE_LOCK    = 25,
+            WOW_FAIL_MUST_USE_BNET      = 26,
+            WOW_FAIL_OTHER              = 255,
+        };
+    }
 }
 
 struct RealmBuildInfo