0007818: Fix "explode" for blowVehicle, add it for client

Client/game_sa/CVehicleSA.cpp

@@ -268,6 +268,7 @@ void CVehicleSA::Init(void)
 
     this->internalID = pGame->GetPools()->GetVehicleRef((DWORD*)this->GetVehicleInterface());
 
+    m_bExplode = true;
     m_bIsDerailable = true;
     m_ucAlpha = 255;
     m_vecGravity = CVector(0.0f, 0.0f, -1.0f);
@@ -1660,6 +1661,11 @@ bool CVehicleSA::IsFadingOut(void)
     return vehicle->m_nVehicleFlags.bFadeOut;
 }
 
+void CVehicleSA::SetWillExplode(bool bExplode)
+{
+    m_bExplode = bExplode;
+}
+
 unsigned char CVehicleSA::GetNumberGettingIn(void)
 {
     return GetVehicleInterface()->m_nNumGettingIn;

Client/game_sa/CVehicleSA.h

@@ -527,6 +527,7 @@ class CVehicleSA : public virtual CVehicle, public virtual CPhysicalSA
     unsigned char                    m_ucVariant;
     unsigned char                    m_ucVariant2;
     unsigned char                    m_ucVariantCount;
+    bool                             m_bExplode;
 
 public:
     CVehicleSA();
@@ -648,6 +649,9 @@ class CVehicleSA : public virtual CVehicle, public virtual CPhysicalSA
     void FadeOut(bool bFadeOut);
     bool IsFadingOut();
 
+    void  SetWillExplode(bool bExplode);
+    bool  GetWillExplode(void) { return m_bExplode; };
+
     void       SetWinchType(eWinchType winchType);
     void       PickupEntityWithWinch(CEntity* pEntity);
     void       ReleasePickedUpEntityWithWinch();

Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp

@@ -1514,12 +1514,14 @@ int CLuaVehicleDefs::FixVehicle(lua_State* luaVM)
 int CLuaVehicleDefs::BlowVehicle(lua_State* luaVM)
 {
     CClientEntity*   pEntity = NULL;
+    bool             bExplode = true;
     CScriptArgReader argStream(luaVM);
     argStream.ReadUserData(pEntity);
+    argStream.ReadBool(bExplode);
 
     if (!argStream.HasErrors())
     {
-        if (CStaticFunctionDefinitions::BlowVehicle(*pEntity))
+        if (CStaticFunctionDefinitions::BlowVehicle(*pEntity, bExplode))
         {
             lua_pushboolean(luaVM, true);
             return 1;

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

@@ -80,14 +80,19 @@ void CVehicleRPCs::BlowVehicle(CClientEntity* pSource, NetBitStreamInterface& bi
 {
     // Read out the vehicle id
     unsigned char ucTimeContext;
-    if (bitStream.Read(ucTimeContext))
+    bool bExplode;
+    if (bitStream.Read(ucTimeContext) && bitStream.ReadBit(bExplode))
     {
         // Grab the vehicle
         CClientVehicle* pVehicle = m_pVehicleManager->Get(pSource->GetID());
         if (pVehicle)
         {
-            // Blow it and change the time context
-            pVehicle->Blow(true);
+            // Send the event when there is no "real" explosion
+            if (!bExplode) {
+                CLuaArguments Arguments;
+                pVehicle->CallEvent("onClientVehicleExplode", Arguments, true);
+            }
+            CStaticFunctionDefinitions::BlowVehicle(*pVehicle, bExplode);
             pVehicle->SetSyncTimeContext(ucTimeContext);
         }
     }

Client/multiplayer_sa/CMultiplayerSA.cpp

@@ -2641,7 +2641,10 @@ bool CallExplosionHandler(void)
 
             case ENTITY_TYPE_VEHICLE:
             {
-                pExplosionCreator = pGameInterface->GetPools()->GetVehicle((DWORD*)pInterface);
+                CVehicle* pVehicle = pGameInterface->GetPools()->GetVehicle((DWORD*)pInterface);
+                if (!pVehicle->GetWillExplode())
+                    return false;
+                pExplosionCreator = pVehicle;
                 break;
             }
 
@@ -2666,7 +2669,10 @@ bool CallExplosionHandler(void)
 
             case ENTITY_TYPE_VEHICLE:
             {
-                pExplodingEntity = dynamic_cast<CEntity*>(pGameInterface->GetPools()->GetVehicle((DWORD*)pExplodingEntityInterface));
+                CVehicle* pVehicle = pGameInterface->GetPools()->GetVehicle((DWORD*)pExplodingEntityInterface);
+                if (!pVehicle->GetWillExplode())
+                    return false;
+                pExplodingEntity = dynamic_cast<CEntity*>(pVehicle);
                 break;
             }
 

Client/sdk/game/CVehicle.h

@@ -163,6 +163,8 @@ class CVehicle : public virtual CPhysical
 
     virtual void BlowUp(CEntity* pCreator, unsigned long ulUnknown) = 0;
     virtual void BlowUpCutSceneNoExtras(unsigned long ulUnknown1, unsigned long ulUnknown2, unsigned long ulUnknown3, unsigned long ulUnknown4) = 0;
+    virtual void SetWillExplode(bool bExplode) = 0;
+    virtual bool GetWillExplode() = 0;
 
     virtual CDamageManager* GetDamageManager() = 0;
     virtual void            FadeOut(bool bFadeOut) = 0;

Server/mods/deathmatch/logic/CGame.cpp

@@ -2558,17 +2558,20 @@ void CGame::Packet_ExplosionSync(CExplosionSyncPacket& Packet)
                                 if (pVehicle->GetIsBlown() == false)
                                 {
                                     pVehicle->SetIsBlown(true);
+                                    pVehicle->SetExplodeBroadcasted(true);
 
                                     // Call the onVehicleExplode event
                                     CLuaArguments Arguments;
                                     pVehicle->CallEvent("onVehicleExplode", Arguments);
                                     // Update our engine State
                                     pVehicle->SetEngineOn(false);
                                 }
-                                else
+                                else if (pVehicle->IsExplodeBroadcasted())
                                 {
                                     bBroadcast = false;
                                 }
+                                else
+                                    pVehicle->SetExplodeBroadcasted(true);
                             }
                         }
                         break;

Server/mods/deathmatch/logic/CVehicle.cpp

@@ -53,6 +53,7 @@ CVehicle::CVehicle(CVehicleManager* pVehicleManager, CElement* pParent, CXMLNode
     m_bRespawnEnabled = false;
     m_ulBlowRespawnInterval = 10000;
     m_ulIdleRespawnInterval = 60000;
+    m_bExplodeBroadcasted = true;
 
     m_bEngineOn = false;
     for (unsigned int i = 0; i < 6; ++i)
@@ -699,6 +700,7 @@ void CVehicle::SpawnAt(const CVector& vecPosition, const CVector& vecRotation)
 {
     SetHealth(GetRespawnHealth());
     SetIsBlown(false);
+    SetExplodeBroadcasted(true);
     StopIdleTimer();
     ResetDoorsWheelsPanelsLights();
     SetLandingGearDown(true);
@@ -865,6 +867,11 @@ bool CVehicle::IsBlowTimerFinished(void)
     return GetIsBlown() && CTickCount::Now() > m_llBlowTime + CTickCount((long long)m_ulBlowRespawnInterval);
 }
 
+void CVehicle::SetExplodeBroadcasted(bool bExplodeBroadcasted)
+{
+    m_bExplodeBroadcasted = bExplodeBroadcasted;
+}
+
 void CVehicle::StopIdleTimer(void)
 {
     m_llIdleTime = CTickCount(0LL);
@@ -945,4 +952,4 @@ void CVehicle::SetRespawnEnabled(bool bEnabled)
 
         m_bRespawnEnabled = bEnabled;
     }
-}
+}

Server/mods/deathmatch/logic/CVehicle.h

@@ -339,6 +339,8 @@ class CVehicle : public CElement
     void SetIsBlown(bool bBlown);
     bool GetIsBlown(void);
     bool IsBlowTimerFinished(void);
+    void SetExplodeBroadcasted(bool bExplodeBroadcasted);
+    bool IsExplodeBroadcasted(void) { return m_bExplodeBroadcasted; };
     void StopIdleTimer(void);
     void RestartIdleTimer(void);
     bool IsIdleTimerRunning(void);
@@ -364,6 +366,7 @@ class CVehicle : public CElement
     float          m_fLastSyncedHealthHealth;
     CTickCount     m_llBlowTime;
     CTickCount     m_llIdleTime;
+    bool           m_bExplodeBroadcasted;
 
     unsigned char m_ucMaxPassengersOverride;