Core/Authserver: Added game account flags

src/server/authserver/Authentication/AuthCodes.h

@@ -70,6 +70,40 @@ enum LoginResult
     LOGIN_LOCKED_ENFORCED                        = 0x10
 };
 
+enum GameAccountFlags
+{
+    GAMEACCOUNT_FLAG_GM                   = 0x00000001,
+    GAMEACCOUNT_FLAG_NOKICK               = 0x00000002,
+    GAMEACCOUNT_FLAG_COLLECTOR            = 0x00000004,
+    GAMEACCOUNT_FLAG_WOW_TRIAL            = 0x00000008,
+    GAMEACCOUNT_FLAG_CANCELLED            = 0x00000010,
+    GAMEACCOUNT_FLAG_IGR                  = 0x00000020,
+    GAMEACCOUNT_FLAG_WHOLESALER           = 0x00000040,
+    GAMEACCOUNT_FLAG_PRIVILEGED           = 0x00000080,
+    GAMEACCOUNT_FLAG_EU_FORBID_ELV        = 0x00000100,
+    GAMEACCOUNT_FLAG_EU_FORBID_BILLING    = 0x00000200,
+    GAMEACCOUNT_FLAG_WOW_RESTRICTED       = 0x00000400,
+    GAMEACCOUNT_FLAG_REFERRAL             = 0x00000800,
+    GAMEACCOUNT_FLAG_BLIZZARD             = 0x00001000,
+    GAMEACCOUNT_FLAG_RECURRING_BILLING    = 0x00002000,
+    GAMEACCOUNT_FLAG_NOELECTUP            = 0x00004000,
+    GAMEACCOUNT_FLAG_KR_CERTIFICATE       = 0x00008000,
+    GAMEACCOUNT_FLAG_EXPANSION_COLLECTOR  = 0x00010000,
+    GAMEACCOUNT_FLAG_DISABLE_VOICE        = 0x00020000,
+    GAMEACCOUNT_FLAG_DISABLE_VOICE_SPEAK  = 0x00040000,
+    GAMEACCOUNT_FLAG_REFERRAL_RESURRECT   = 0x00080000,
+    GAMEACCOUNT_FLAG_EU_FORBID_CC         = 0x00100000,
+    GAMEACCOUNT_FLAG_OPENBETA_DELL        = 0x00200000,
+    GAMEACCOUNT_FLAG_PROPASS              = 0x00400000,
+    GAMEACCOUNT_FLAG_PROPASS_LOCK         = 0x00800000,
+    GAMEACCOUNT_FLAG_PENDING_UPGRADE      = 0x01000000,
+    GAMEACCOUNT_FLAG_RETAIL_FROM_TRIAL    = 0x02000000,
+    GAMEACCOUNT_FLAG_EXPANSION2_COLLECTOR = 0x04000000,
+    GAMEACCOUNT_FLAG_OVERMIND_LINKED      = 0x08000000,
+    GAMEACCOUNT_FLAG_DEMOS                = 0x10000000,
+    GAMEACCOUNT_FLAG_DEATH_KNIGHT_OK      = 0x20000000,
+};
+
 namespace Battlenet
 {
     enum AuthResult

src/server/authserver/Server/AuthSocket.cpp

@@ -680,7 +680,7 @@ bool AuthSocket::_HandleLogonProof()
             memcpy(proof.M2, sha.GetDigest(), 20);
             proof.cmd = AUTH_LOGON_PROOF;
             proof.error = 0;
-            proof.unk1 = 0x00800000;    // Accountflags. 0x01 = GM, 0x08 = Trial, 0x00800000 = Pro pass (arena tournament)
+            proof.unk1 = GAMEACCOUNT_FLAG_PROPASS_LOCK;
             proof.unk2 = 0x00;          // SurveyId
             proof.unk3 = 0x00;
             socket().send((char *)&proof, sizeof(proof));

src/server/authserver/Server/BattlenetPackets.cpp

@@ -203,10 +203,10 @@ void Battlenet::AuthComplete::Write()
         _stream.WriteString(LastName, 8); // Last name - not set for WoW
 
         _stream.Write(GameAccountId, 32);
-        _stream.Write(2, 8);
+        _stream.Write(Region, 8);
         _stream.Write(0, 64);
 
-        _stream.Write(2, 8);
+        _stream.Write(GameAccountRegion, 8);
         _stream.WriteString(GameAccountName, 5, -1);
         _stream.Write(GameAccountFlags, 64);
 

src/server/authserver/Server/BattlenetPackets.h

@@ -208,7 +208,7 @@ namespace Battlenet
     public:
         AuthComplete() : ServerPacket(PacketHeader(SMSG_AUTH_COMPLETE, AUTHENTICATION)),
             Result(AUTH_OK), ErrorType(0), PingTimeout(120000), Threshold(25000000), Rate(1000),
-            FirstName(""), LastName(""), GameAccountId(0), GameAccountName("")
+            FirstName(""), LastName(""), Region(2), GameAccountId(0), GameAccountRegion(2), GameAccountName("")
         {
         }
 
@@ -227,7 +227,9 @@ namespace Battlenet
         uint32 Rate;
         std::string FirstName;
         std::string LastName;
+        uint8 Region;
         uint32 GameAccountId;
+        uint8 GameAccountRegion;
         std::string GameAccountName;
         uint64 GameAccountFlags;
     };

src/server/authserver/Server/BattlenetSocket.cpp

@@ -466,11 +466,11 @@ bool Battlenet::Socket::HandleRealmUpdateSubscribe(PacketHeader& /*header*/, Bit
         if (flag & REALM_FLAG_SPECIFYBUILD)
         {
             std::ostringstream version;
-            version << buildInfo->MajorVersion << '.' << buildInfo->MinorVersion << '.' << buildInfo->BugfixVersion << '.' << buildInfo->HotfixVersion;
+            version << buildInfo->MajorVersion << '.' << buildInfo->MinorVersion << '.' << buildInfo->BugfixVersion << '.' << buildInfo->Build;
 
             update->Version = version.str();
             update->Address = realm.GetAddressForClient(clientAddr);
-            update->Build = realm.gamebuild;
+            update->Build = buildInfo->Build;
         }
 
         update->Flags = flag;
@@ -870,7 +870,7 @@ bool Battlenet::Socket::HandleRiskFingerprintModule(BitStream* dataStream, Serve
 
         complete->GameAccountId = _gameAccountId;
         complete->GameAccountName = str.str();
-        complete->GameAccountFlags = 1;
+        complete->GameAccountFlags = GAMEACCOUNT_FLAG_PROPASS_LOCK;
 
         SQLTransaction trans = LoginDatabase.BeginTransaction();