Increment BitStream version for Discord update (#1330)

multitheftauto · Mar 27, 2020 · a0ce68f · a0ce68f
1 parent 0b14837
commit a0ce68f
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/Client/mods/deathmatch/logic/CClientGame.cpp b/Client/mods/deathmatch/logic/CClientGame.cpp
@@ -631,7 +631,7 @@ bool CClientGame::StartGame(const char* szNick, const char* szPassword, eServerT
             std::string strUser;
             pBitStream->Write(strUser.c_str(), MAX_SERIAL_LENGTH);
 
-            if (g_pNet->GetServerBitStreamVersion() >= 0x06D)
+            if (g_pNet->GetServerBitStreamVersion() >= 0x06E)
             {
                 SString joinSecret = SStringX(szSecret);
                 pBitStream->WriteString<uchar>(joinSecret);
@@ -6954,7 +6954,7 @@ void CClientGame::RestreamModel(unsigned short usModel)
 
 void CClientGame::TriggerDiscordJoin(SString strSecret)
 {
-    if (g_pNet->GetServerBitStreamVersion() < 0x06D)
+    if (g_pNet->GetServerBitStreamVersion() < 0x06E)
         return;
 
     NetBitStreamInterface* pBitStream = g_pNet->AllocateNetBitStream();
@@ -7108,7 +7108,7 @@ void CClientGame::UpdateDiscordState()
     uint playerSlot = g_pClientGame->GetServerInfo()->GetMaxPlayers();
     SString state(std::to_string(playerCount));
 
-    if (g_pCore->GetNetwork()->GetServerBitStreamVersion() >= 0x06D)
+    if (g_pCore->GetNetwork()->GetServerBitStreamVersion() >= 0x06E)
         state += "/" + std::to_string(playerSlot);
 
     state += (playerCount == 1 && (!playerSlot || playerSlot == 1) ? " Player" : " Players");

diff --git a/Client/version.h b/Client/version.h
@@ -74,7 +74,7 @@
 #define _NETCODE_VERSION_BRANCH_ID      0x4         // Use 0x1 - 0xF to indicate an incompatible branch is being used (0x0 is reserved, 0x4 is trunk)
 #define _CLIENT_NET_MODULE_VERSION      0x0AB       // (0x000 - 0xfff) Lvl9 wizards only
 #define _NETCODE_VERSION                0x1DA       // (0x000 - 0xfff) Increment when net messages change (pre-release)
-#define MTA_DM_BITSTREAM_VERSION        0x06D       // (0x000 - 0xfff) Increment when net messages change (post-release). (Changing will also require additional backward compatibility code).
+#define MTA_DM_BITSTREAM_VERSION        0x06E       // (0x000 - 0xfff) Increment when net messages change (post-release). (Changing will also require additional backward compatibility code).
 
 // To avoid user confusion, make sure the ASE version matches only if communication is possible
 #if defined(MTA_DM_CONNECT_TO_PUBLIC)

diff --git a/Server/mods/deathmatch/logic/CGame.cpp b/Server/mods/deathmatch/logic/CGame.cpp
@@ -1238,7 +1238,7 @@ void CGame::JoinPlayer(CPlayer& Player)
     marker.Set("CPlayerJoinCompletePacket");
 
     // Sync up server info on entry
-    if (Player.GetBitStreamVersion() >= 0x06D)
+    if (Player.GetBitStreamVersion() >= 0x06E)
         Player.Send(CServerInfoSyncPacket(SERVER_INFO_FLAG_ALL));
 
     // Add debug info if wanted

diff --git a/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
@@ -3312,7 +3312,7 @@ bool CStaticFunctionDefinitions::SetPlayerDiscordJoinParams(CElement* pElement,
     {
         CPlayer* pPlayer = static_cast<CPlayer*>(pElement);
 
-        if (pPlayer->GetBitStreamVersion() < 0x06D)
+        if (pPlayer->GetBitStreamVersion() < 0x06E)
             return false;
 
         CBitStream bitStream;

diff --git a/Server/mods/deathmatch/logic/packets/CPlayerJoinDataPacket.cpp b/Server/mods/deathmatch/logic/packets/CPlayerJoinDataPacket.cpp
@@ -31,7 +31,7 @@ bool CPlayerJoinDataPacket::Read(NetBitStreamInterface& BitStream)
         m_strNick = *m_strNick;
         m_strSerialUser = *m_strSerialUser;
 
-        if (m_usBitStreamVersion >= 0x06D)
+        if (m_usBitStreamVersion >= 0x06E)
         {
             if (!BitStream.ReadString<uchar>(m_strDiscordSecret))
                 return false;

diff --git a/Server/version.h b/Server/version.h
@@ -77,7 +77,7 @@
 #define _NETCODE_VERSION_BRANCH_ID      0x4         // Use 0x1 - 0xF to indicate an incompatible branch is being used (0x0 is reserved, 0x4 is trunk)
 #define _SERVER_NET_MODULE_VERSION      0x0AB       // (0x000 - 0xfff) Lvl9 wizards only
 #define _NETCODE_VERSION                0x1DA       // (0x000 - 0xfff) Increment when net messages change (pre-release)
-#define MTA_DM_BITSTREAM_VERSION        0x06D       // (0x000 - 0xfff) Increment when net messages change (post-release). (Changing will also require additional backward compatibility code).
+#define MTA_DM_BITSTREAM_VERSION        0x06E       // (0x000 - 0xfff) Increment when net messages change (post-release). (Changing will also require additional backward compatibility code).
 
 // To avoid user confusion, make sure the ASE version matches only if communication is possible
 #if defined(MTA_DM_CONNECT_FROM_PUBLIC)