Fixed some not working smart covers in CS (#382)

OpenXRay · Oct 6, 2019 · 52ce001 · 52ce001
1 parent c376098
commit 52ce001
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/xrGame/stalker_movement_manager_smart_cover.cpp b/src/xrGame/stalker_movement_manager_smart_cover.cpp
@@ -252,11 +252,7 @@ void stalker_movement_manager_smart_cover::reach_enter_location(u32 const& time_
     if (!object().sight().current_action().target_reached())
         return;
 
-    // morrey
-    // смарткаверы чн-ные не работали. заюзал из чн алгоритм
-    //if (target_params().cover()->can_fire()) // ЗП
-    //if (target_params().cover()->is_combat_cover()) // ЧН
-    if (target_params().cover()->can_fire() || target_params().cover()->is_combat_cover()) // Xottab_DUTY to morrey: а если так попробовать?
+    if (target_params().cover()->can_fire())
     {
         CInventoryItem const* const inventory_item = object().inventory().ActiveItem();
         if (!inventory_item)

diff --git a/src/xrServerEntities/xrServer_Objects_Alife_Smartcovers.cpp b/src/xrServerEntities/xrServer_Objects_Alife_Smartcovers.cpp
@@ -114,6 +114,13 @@ void CSE_SmartCover::STATE_Read(NET_Packet& tNetPacket, u16 size)
 
     if (m_wVersion >= 128)
         m_can_fire = tNetPacket.r_u8();
+    else
+    {
+        // I don't know how, but it seems that
+        // m_is_combat_cover can be changed
+        // in scripts. Let's just sync here.
+        m_can_fire = m_is_combat_cover;
+    }
 }
 
 void CSE_SmartCover::STATE_Write(NET_Packet& tNetPacket)