Merge pull request OpenXRay#1020 from Graff46/project2/dev

AMS21 · Feb 6, 2025 · 0f09f03 · 0f09f03
2 parents 7c6eab4 + c8fc259
commit 0f09f03
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/src/xrGame/DestroyablePhysicsObject.cpp b/src/xrGame/DestroyablePhysicsObject.cpp
@@ -58,6 +58,15 @@ bool CDestroyablePhysicsObject::net_Spawn(CSE_Abstract* DC)
             m_destroy_sound.create(ini->r_string("sound", "break_sound"), st_Effect, sg_SourceType);
         if (ini->section_exist("particles"))
             m_destroy_particles = ini->r_string("particles", "destroy_particles");
+        if (ini->section_exist("hit_from"))
+        {
+            CInifile::Sect& data = ini->r_section("hit_from");
+            if (data.Data.size() > 0)
+            {
+                for (auto I = data.Data.cbegin(); I != data.Data.cend(); ++I)
+                    hit_object_name.push_back(I->first.c_str());
+            }
+        }
     }
     CParticlesPlayer::LoadParticles(K);
     RunStartupAnim(DC);
@@ -70,8 +79,12 @@ bool CDestroyablePhysicsObject::net_Spawn(CSE_Abstract* DC)
 void CDestroyablePhysicsObject::Hit(SHit* pHDS)
 {
     SHit HDS = *pHDS;
-    callback(GameObject::eHit)(
-        lua_game_object(), HDS.power, HDS.dir, smart_cast<const CGameObject*>(HDS.who)->lua_game_object(), HDS.bone());
+    IGameObject* who = HDS.who;
+    callback(GameObject::eHit)(lua_game_object(), HDS.power, HDS.dir, who->lua_game_object(), HDS.bone());
+
+    if (!hit_object_name.empty() && std::find(hit_object_name.begin(), hit_object_name.end(), who->Name()) == hit_object_name.end())
+        return;
+
     HDS.power = CHitImmunity::AffectHit(HDS.power, HDS.hit_type);
     float hit_scale = 1.f, wound_scale = 1.f;
     CDamageManager::HitScale(HDS.bone(), hit_scale, wound_scale);

diff --git a/src/xrGame/DestroyablePhysicsObject.h b/src/xrGame/DestroyablePhysicsObject.h
@@ -13,6 +13,7 @@ class CDestroyablePhysicsObject : public CPhysicObject,
     float m_fHealth;
     ref_sound m_destroy_sound;
     shared_str m_destroy_particles;
+    xr_vector<pcstr> hit_object_name;
 
 public:
     CDestroyablePhysicsObject();

diff --git a/src/xrGame/PHCollisionDamageReceiver.cpp b/src/xrGame/PHCollisionDamageReceiver.cpp
@@ -49,7 +49,7 @@ void CPHCollisionDamageReceiver::CollisionHit(u16 source_id, u16 bone_id, float
     SHit HS;
 
     HS.GenHeader(GE_HIT, ph->ID()); //	ph->u_EventGen(P,GE_HIT,ph->ID());
-    HS.whoID = ph->ID(); //	P.w_u16		(ph->ID());
+    HS.whoID = source_id; //	P.w_u16		(ph->ID());
     HS.weaponID = source_id; //	P.w_u16		(source_id);
     HS.dir = dir; //	P.w_dir		(dir);
     HS.power = power; //	P.w_float	(power);

diff --git a/src/xrGame/PHDestroyable.cpp b/src/xrGame/PHDestroyable.cpp
@@ -173,8 +173,17 @@ void CPHDestroyable::Load(CInifile* ini, LPCSTR section)
         if (data.Data.size() > 0)
             m_flags.set(fl_destroyable, true);
         for (const auto& I : data.Data)
-            if (I.first.size())
+        {
+            if (I.first.empty())
+                continue;
+            m_destroyed_obj_visual_names.push_back(I.first);
+            u32 count = 1;
+            if (!I.second.empty())
+                count = atoi(I.second.c_str());
+
+            for (u32 i = 0; i < count; ++i)
                 m_destroyed_obj_visual_names.push_back(I.first);
+        }
     }
 }
 void CPHDestroyable::Load(LPCSTR section)