Add GetWeaponTypeFromExplosionType and refactor explosion logic

Author: MohabCodeX

Client/mods/deathmatch/logic/CClientExplosionManager.cpp

@@ -39,6 +39,23 @@ bool CClientExplosionManager::Hook_StaticExplosionCreation(CEntity* pGameExplodi
     return g_pExplosionManager->Hook_ExplosionCreation(pGameExplodingEntity, pGameCreator, vecPosition, explosionType);
 }
 
+eWeaponType CClientExplosionManager::GetWeaponTypeFromExplosionType(eExplosionType explosionType)
+{
+    switch (explosionType) {
+        case EXP_TYPE_GRENADE:
+            return WEAPONTYPE_GRENADE;
+        case EXP_TYPE_MOLOTOV:
+            return WEAPONTYPE_MOLOTOV;
+        case EXP_TYPE_ROCKET:
+        case EXP_TYPE_ROCKET_WEAK:
+            return WEAPONTYPE_ROCKET;
+        case EXP_TYPE_TANK_GRENADE:
+            return WEAPONTYPE_TANK_GRENADE;
+        default:
+            return WEAPONTYPE_EXPLOSION;
+    }
+}
+
 bool CClientExplosionManager::Hook_ExplosionCreation(CEntity* pGameExplodingEntity, CEntity* pGameCreator, const CVector& vecPosition,
                                                      eExplosionType explosionType)
 {
@@ -52,42 +69,20 @@ bool CClientExplosionManager::Hook_ExplosionCreation(CEntity* pGameExplodingEnti
 
     CClientEntity* const pResponsible = pPools->GetClientEntity(reinterpret_cast<DWORD*>(pResponsibleGameEntity->GetInterface()));
 
-    if (!pResponsible)
-    {
-        if (pGameCreator)
-        {
-            CClientPlayer* pLocalPlayer = m_pManager->GetPlayerManager()->GetLocalPlayer();
-            if (pLocalPlayer && pLocalPlayer->GetGameEntity() == pGameCreator)
-            {
-                eWeaponType explosionWeaponType = WEAPONTYPE_EXPLOSION;
-                switch (explosionType)
-                {
-                    case EXP_TYPE_GRENADE:
-                        explosionWeaponType = WEAPONTYPE_GRENADE;
-                        break;
-                    case EXP_TYPE_MOLOTOV:
-                        explosionWeaponType = WEAPONTYPE_MOLOTOV;
-                        break;
-                    case EXP_TYPE_ROCKET:
-                    case EXP_TYPE_ROCKET_WEAK:
-                        explosionWeaponType = WEAPONTYPE_ROCKET;
-                        break;
-                    case EXP_TYPE_TANK_GRENADE:
-                        explosionWeaponType = WEAPONTYPE_TANK_GRENADE;
-                        break;
-                    default:
-                        break;
-                }
-                
-                CLuaArguments arguments;
-                arguments.PushNumber(vecPosition.fX);
-                arguments.PushNumber(vecPosition.fY);
-                arguments.PushNumber(vecPosition.fZ);
-                arguments.PushNumber(explosionWeaponType);
-                return pLocalPlayer->CallEvent("onClientExplosion", arguments, true);
-            }
-        }
-        return false;
+    if (!pResponsible) {
+        if (!pGameCreator) return false;
+
+        CClientPlayer* pLocalPlayer = m_pManager->GetPlayerManager()->GetLocalPlayer();
+        if (!pLocalPlayer || pLocalPlayer->GetGameEntity() != pGameCreator) return false;
+
+        eWeaponType explosionWeaponType = GetWeaponTypeFromExplosionType(explosionType);
+
+        CLuaArguments arguments;
+        arguments.PushNumber(vecPosition.fX);
+        arguments.PushNumber(vecPosition.fY);
+        arguments.PushNumber(vecPosition.fZ);
+        arguments.PushNumber(explosionWeaponType);
+        return pLocalPlayer->CallEvent("onClientExplosion", arguments, true);
     }
 
     // Determine the used weapon
@@ -202,27 +197,7 @@ CExplosion* CClientExplosionManager::Create(eExplosionType explosionType, CVecto
     if (responsibleWeapon != WEAPONTYPE_UNARMED)
         m_LastWeaponType = responsibleWeapon;
     else
-    {
-        switch (explosionType)
-        {
-            case EXP_TYPE_GRENADE:
-                m_LastWeaponType = WEAPONTYPE_GRENADE;
-                break;
-            case EXP_TYPE_MOLOTOV:
-                m_LastWeaponType = WEAPONTYPE_MOLOTOV;
-                break;
-            case EXP_TYPE_ROCKET:
-            case EXP_TYPE_ROCKET_WEAK:
-                m_LastWeaponType = WEAPONTYPE_ROCKET;
-                break;
-            case EXP_TYPE_TANK_GRENADE:
-                m_LastWeaponType = WEAPONTYPE_TANK_GRENADE;
-                break;
-            default:
-                m_LastWeaponType = WEAPONTYPE_EXPLOSION;
-                break;
-        }
-    }
+        m_LastWeaponType = GetWeaponTypeFromExplosionType(explosionType);
 
     if (pCreator && pCreator->IsLocalEntity())
     {

Client/mods/deathmatch/logic/CClientExplosionManager.h

@@ -34,5 +34,6 @@ class CClientExplosionManager
     CClientEntityPtr m_pLastCreator;
 
 private:
-    CClientManager* m_pManager;
+    CClientManager*  m_pManager;
+    eWeaponType      GetWeaponTypeFromExplosionType(eExplosionType explosionType);
 };