Updated fix #9038 (bugged shotgun with bullet sync) to only work if all connected clients support it

Author: ccw808

MTA10/mods/deathmatch/logic/CClientGame.h

@@ -77,6 +77,7 @@ struct SMiscGameSettings
     bool bUseAltPulseOrder;
     bool bAllowFastSprintFix;
     bool bAllowBadDrivebyHitboxFix;
+    bool bAllowShotgunDamageFix;
 };
 
 class CClientGame

MTA10/mods/deathmatch/logic/CPacketHandler.cpp

@@ -5158,10 +5158,15 @@ void CPacketHandler::Packet_SyncSettings ( NetBitStreamInterface& bitStream )
     if ( bitStream.Version() >= 0x59 )
         bitStream.Read ( ucAllowBadDrivebyHitboxesFix );
 
+    uchar ucAllowShotgunDamageFix = 0;
+    if ( bitStream.Version() >= 0x64 )
+        bitStream.Read ( ucAllowShotgunDamageFix );
+
     SMiscGameSettings miscGameSettings;
     miscGameSettings.bUseAltPulseOrder = ( ucUseAltPulseOrder != 0 );
     miscGameSettings.bAllowFastSprintFix = ( ucAllowFastSprintFix != 0 );
     miscGameSettings.bAllowBadDrivebyHitboxFix = (ucAllowBadDrivebyHitboxesFix != 0);
+    miscGameSettings.bAllowShotgunDamageFix = ( ucAllowShotgunDamageFix != 0 );
     g_pClientGame->SetMiscGameSettings( miscGameSettings );
 }
 

MTA10/mods/shared_logic/CClientPlayer.cpp

@@ -277,13 +277,14 @@ void CClientPlayer::DischargeWeapon ( eWeaponType weaponType, const CVector& vec
             m_shotSyncData->m_vecRemoteBulletSyncEnd = vecEnd;
             m_shotSyncData->m_bRemoteBulletSyncVectorsValid = true;
 
-#if MTA_DM_VERSION >= 0x151 
+            g_iDamageEventLimit = 1;
+
             // Fixed #9038: bugged shotgun with bullet sync
             if ( weaponType == WEAPONTYPE_SHOTGUN || weaponType == WEAPONTYPE_SAWNOFF_SHOTGUN || weaponType == WEAPONTYPE_SPAS12_SHOTGUN )
-                g_iDamageEventLimit = 2;
-            else
-#endif
-                g_iDamageEventLimit = 1;
+            {
+                if ( g_pClientGame->GetMiscGameSettings().bAllowShotgunDamageFix )
+                    g_iDamageEventLimit = 2;
+            }
 
             // Fire
             CWeapon* pWeapon = m_pPlayerPed->GetWeapon ( m_pPlayerPed->GetCurrentWeaponSlot () );

MTA10/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 _CLIENT_NET_MODULE_VERSION      0x095       // (0x000 - 0xfff) Lvl9 wizards only
 #define _NETCODE_VERSION                0x1DA       // (0x000 - 0xfff) Increment when net messages change (pre-release)
-#define MTA_DM_BITSTREAM_VERSION        0x063       // (0x000 - 0xfff) Increment when net messages change (post-release). (Changing will also require additional backward compatibility code).
+#define MTA_DM_BITSTREAM_VERSION        0x064       // (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)

MTA10_Server/mods/deathmatch/logic/CGame.cpp

@@ -39,6 +39,7 @@
 #define SNIPER_BULLET_SYNC_MIN_CLIENT_VERSION   "1.3.5-9.06054"
 #define SPRINT_FIX_MIN_CLIENT_VERSION           "1.3.5-9.06277"
 #define DRIVEBY_HITBOX_FIX_MIN_CLIENT_VERSION   "1.4.0-5.06399"
+#define SHOTGUN_DAMAGE_FIX_MIN_CLIENT_VERSION   "1.5.1"
 
 CGame* g_pGame = NULL;
 
@@ -4172,6 +4173,7 @@ void CGame::SendSyncSettings ( CPlayer* pPlayer )
     uchar ucUseAltPulseOrder = m_pMainConfig->GetUseAltPulseOrder () != 0;
     uchar ucAllowFastSprintFix = false;
     uchar ucAllowDrivebyAnimFix = false;
+    uchar ucAllowShotgunDamageFix = false;
 
     // Add sprint fix if all clients can handle it
     if ( ExtractVersionStringBuildNumber( m_pPlayerManager->GetLowestConnectedPlayerVersion() ) >= ExtractVersionStringBuildNumber( SPRINT_FIX_MIN_CLIENT_VERSION ) )
@@ -4181,7 +4183,11 @@ void CGame::SendSyncSettings ( CPlayer* pPlayer )
     if (ExtractVersionStringBuildNumber(m_pPlayerManager->GetLowestConnectedPlayerVersion()) >= ExtractVersionStringBuildNumber( DRIVEBY_HITBOX_FIX_MIN_CLIENT_VERSION ))
         ucAllowDrivebyAnimFix = true;
 
-    CSyncSettingsPacket packet(weaponTypesUsingBulletSync, ucVehExtrapolateEnabled, sVehExtrapolateBaseMs, sVehExtrapolatePercent, sVehExtrapolateMaxMs, ucUseAltPulseOrder, ucAllowFastSprintFix, ucAllowDrivebyAnimFix);
+    // Add shotgun bullet sync damage fix if all clients can handle it
+    if ( m_pPlayerManager->GetLowestConnectedPlayerVersion() >= SHOTGUN_DAMAGE_FIX_MIN_CLIENT_VERSION )
+        ucAllowShotgunDamageFix = true;
+
+    CSyncSettingsPacket packet(weaponTypesUsingBulletSync, ucVehExtrapolateEnabled, sVehExtrapolateBaseMs, sVehExtrapolatePercent, sVehExtrapolateMaxMs, ucUseAltPulseOrder, ucAllowFastSprintFix, ucAllowDrivebyAnimFix, ucAllowShotgunDamageFix );
     if ( pPlayer )
         pPlayer->Send ( packet );
     else

MTA10_Server/mods/deathmatch/logic/packets/CSyncSettingsPacket.cpp

@@ -18,7 +18,8 @@ CSyncSettingsPacket::CSyncSettingsPacket ( const std::set < eWeaponType >& weapo
                                             short sVehExtrapolateMaxMs,
                                             uchar ucUseAltPulseOrder,
                                             uchar ucAllowFastSprintFix,
-                                            uchar ucAllowDrivebyAnimationFix)
+                                            uchar ucAllowDrivebyAnimationFix,
+                                            uchar ucAllowShotgunDamageFix )
 {
     m_weaponTypesUsingBulletSync = weaponTypesUsingBulletSync;
     m_ucVehExtrapolateEnabled = ucVehExtrapolateEnabled;
@@ -28,6 +29,7 @@ CSyncSettingsPacket::CSyncSettingsPacket ( const std::set < eWeaponType >& weapo
     m_ucUseAltPulseOrder = ucUseAltPulseOrder;
     m_ucAllowFastSprintFix = ucAllowFastSprintFix;
     m_ucAllowDrivebyAnimationFix = ucAllowDrivebyAnimationFix;
+    m_ucAllowShotgunDamageFix = ucAllowShotgunDamageFix;
 }
 
 
@@ -70,5 +72,10 @@ bool CSyncSettingsPacket::Write ( NetBitStreamInterface& BitStream ) const
         BitStream.Write(m_ucAllowDrivebyAnimationFix);
     }
 
+    if ( BitStream.Version() >= 0x64 )
+    {
+        BitStream.Write( m_ucAllowShotgunDamageFix );
+    }
+
     return true;
 }

MTA10_Server/mods/deathmatch/logic/packets/CSyncSettingsPacket.h

@@ -19,7 +19,8 @@ class CSyncSettingsPacket : public CPacket
                                                                             short sVehExtrapolateMaxMs,
                                                                             uchar ucUseAltPulseOrder,
                                                                             uchar ucAllowFastSprintFix,
-                                                                            uchar ucAllowDrivebyAnimationFix);
+                                                                            uchar ucAllowDrivebyAnimationFix,
+                                                                            uchar ucAllowShotgunDamageFix );
 
     inline ePacketID                        GetPacketID                 ( void ) const                  { return PACKET_ID_SYNC_SETTINGS; };
     unsigned long                           GetFlags                    ( void ) const                  { return PACKET_HIGH_PRIORITY | PACKET_RELIABLE | PACKET_SEQUENCED; };
@@ -35,4 +36,5 @@ class CSyncSettingsPacket : public CPacket
     uchar                       m_ucUseAltPulseOrder;
     uchar                       m_ucAllowFastSprintFix;
     uchar                       m_ucAllowDrivebyAnimationFix;
+    uchar                       m_ucAllowShotgunDamageFix;
 };

MTA10_Server/version.h

@@ -80,7 +80,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      0x095       // (0x000 - 0xfff) Lvl9 wizards only
 #define _NETCODE_VERSION                0x1DA       // (0x000 - 0xfff) Increment when net messages change (pre-release)
-#define MTA_DM_BITSTREAM_VERSION        0x063       // (0x000 - 0xfff) Increment when net messages change (post-release). (Changing will also require additional backward compatibility code).
+#define MTA_DM_BITSTREAM_VERSION        0x064       // (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)