Test for remote weapon desync #2

Author: ccw808

Client/mods/deathmatch/logic/CClientPed.cpp

@@ -2093,6 +2093,8 @@ bool CClientPed::SetCurrentWeaponSlot ( eWeaponSlot weaponSlot )
                     // Don't allow doing gang driveby while unarmed
                     if ( IsDoingGangDriveby () )
                         SetDoingGangDriveby ( false );
+                    m_CurrentWeaponSlot = weaponSlot;
+                    return true;
                 }
                 else
                 {
@@ -2844,7 +2846,7 @@ void CClientPed::StreamedInPulse ( bool bDoStandardPulses )
             m_RestoreWeaponList.pop_front();
 
             // Give our Weapon back after deleting to reload the model
-            CWeapon * pWeapon = GiveWeapon ( item.eWeaponID, item.dwAmmo );
+            CWeapon * pWeapon = GiveWeapon ( item.eWeaponID, item.dwAmmo, item.bCurrentWeapon );
 
             // Reset our states
             pWeapon->SetAmmoInClip ( item.dwClipAmmo );
@@ -3496,11 +3498,7 @@ void CClientPed::UpdateKeysync ( bool bCleanup )
                                     CWeapon* pSlotWeapon = GetWeapon ( eCurrentSlot );
                                     if ( pSlotWeapon )
                                     {
-                                        pPlayerWeapon = GiveWeapon ( pSlotWeapon->GetType (), pData->usWeaponAmmo );
-                                        if ( pPlayerWeapon )
-                                        {
-                                            pPlayerWeapon->SetAsCurrentWeapon ();
-                                        }
+                                        pPlayerWeapon = GiveWeapon ( pSlotWeapon->GetType (), pData->usWeaponAmmo, true );
                                     }
                                 }
 

Client/mods/deathmatch/logic/CNetAPI.cpp

@@ -1520,10 +1520,9 @@ void CNetAPI::ReadVehiclePuresync ( CClientPlayer* pPlayer, CClientVehicle* pVeh
 
             if ( pWeapon )
             {
-                CWeapon* pPlayerWeapon = pPlayer->GiveWeapon ( static_cast < eWeaponType > ( ucCurrentWeapon ), usWeaponAmmo );
+                CWeapon* pPlayerWeapon = pPlayer->GiveWeapon ( static_cast < eWeaponType > ( ucCurrentWeapon ), usWeaponAmmo, true );
                 if ( pPlayerWeapon )
                 {
-                    pPlayerWeapon->SetAsCurrentWeapon ();
                     pPlayerWeapon->SetAmmoTotal ( BitStream.Version () >= 0x44 ? ammo.data.usTotalAmmo : 9999 );
                     pPlayerWeapon->SetAmmoInClip ( usWeaponAmmo );
                 }

Client/mods/deathmatch/logic/rpc/CWeaponRPCs.cpp

@@ -34,7 +34,7 @@ void CWeaponRPCs::GiveWeapon ( CClientEntity* pSource, NetBitStreamInterface& bi
         SWeaponAmmoSync ammo ( weaponType.data.ucWeaponType, true, false );
         if ( bitStream.Read ( &ammo ) )
         {
-            bool bGiveWeapon = bitStream.ReadBit ();
+            bool bSetAsCurrent = bitStream.ReadBit ();
             unsigned char ucWeaponID = weaponType.data.ucWeaponType;
             unsigned short usAmmo = ammo.data.usTotalAmmo;
 
@@ -51,12 +51,9 @@ void CWeaponRPCs::GiveWeapon ( CClientEntity* pSource, NetBitStreamInterface& bi
                         if ( usAmmo > 9999 ) usAmmo = 9999;
 
                         // Give the local player the weapon
-                        CWeapon* pPlayerWeapon = NULL;
                         if ( ucWeaponID != 0 )
                         {
-                            pPlayerWeapon = pPed->GiveWeapon ( static_cast < eWeaponType > ( ucWeaponID ), usAmmo );
-                            if ( pPlayerWeapon && bGiveWeapon )
-                                pPlayerWeapon->SetAsCurrentWeapon ();
+                            pPed->GiveWeapon ( static_cast < eWeaponType > ( ucWeaponID ), usAmmo, bSetAsCurrent );
 
                             // Store the ammo so it's not lost if a ped is streamed out
                             if ( pPed->GetType () == CCLIENTPED )
@@ -76,7 +73,7 @@ void CWeaponRPCs::GiveWeapon ( CClientEntity* pSource, NetBitStreamInterface& bi
                             {
                                 eWeaponType unarmedWeapon = oldWeapon->GetType();
                                 pPed->RemoveWeapon ( unarmedWeapon );
-                                if ( bGiveWeapon || pPed->GetCurrentWeaponSlot() == WEAPONSLOT_TYPE_UNARMED )
+                                if ( bSetAsCurrent || pPed->GetCurrentWeaponSlot() == WEAPONSLOT_TYPE_UNARMED )
                                 {
                                     oldWeapon = NULL;
                                     if ( unarmedWeapon == WEAPONTYPE_BRASSKNUCKLE )
@@ -107,7 +104,7 @@ void CWeaponRPCs::GiveWeapon ( CClientEntity* pSource, NetBitStreamInterface& bi
                             {
                                 // Probably the ped is streamed out
                                 pPed->GiveWeapon ( WEAPONTYPE_UNARMED, 1 );
-                                if ( bGiveWeapon )
+                                if ( bSetAsCurrent )
                                     pPed->SetCurrentWeaponSlot ( WEAPONSLOT_TYPE_UNARMED );
                             }
                         }