= Consumables greater then 1x1 inv_grid_width will no longer crash the game when dragged onto a quick slot because they are ignored

Author: revolucas

src/xrGame/ShootingObject.cpp

@@ -69,7 +69,10 @@ void CShootingObject::Load(LPCSTR section)
     modeShotTime = 60.f / modeShotTime;
 
     //Cycle down RPM after first 2 shots; used for Abakan/AN-94
-    cycleDown = READ_IF_EXISTS(pSettings, r_bool, section, "cycle_down", false);
+    if (pSettings->line_exist(section, "cycle_down"))
+        cycleDown = pSettings->r_bool(section, "cycle_down");
+    else
+        cycleDown = false;
     //Alundaio: END
 
     LoadFireParams(section);

src/xrGame/ai/stalker/ai_stalker_misc.cpp

@@ -177,7 +177,6 @@ void CAI_Stalker::process_enemies()
     typedef MemorySpace::squad_mask_type squad_mask_type;
     typedef CVisualMemoryManager::VISIBLES VISIBLES;
 
-    bool found = false;
     squad_mask_type mask = memory().visual().mask();
     VISIBLES::const_iterator I = memory().visual().objects().begin();
     VISIBLES::const_iterator E = memory().visual().objects().end();
@@ -209,7 +208,6 @@ void CAI_Stalker::process_enemies()
         //Alundaio: END
 
         memory().make_object_visible_somewhen(member->memory().enemy().selected());
-        found = true;
         break;
     }
 }

src/xrGame/stalker_combat_actions.cpp

@@ -441,14 +441,14 @@ void CStalkerActionKillEnemy::execute()
         CMemoryInfo mem_object = object().memory().memory(enemy);
         if (mem_object.m_object)
             object().best_cover(mem_object.m_object_params.m_position);
-        u32 last_time_seen = object().memory().visual().visible_object_time_last_seen(enemy);
 
-        //Here NPC will only fire at not visible enemy for no more than 3 seconds instead of shooting at walls like morons
-        if (last_time_seen != u32(-1) && Device.dwTimeGlobal - last_time_seen <= 3000)
+        if (object().memory().visual().visible_now(enemy))
         {
             object().sight().setup(CSightAction(enemy, true, true));
             fire();
         }
+        else if (mem_object.m_object)
+            object().sight().setup(CSightAction(SightManager::eSightTypePosition,mem_object.m_object_params.m_position,true));
     }
     else
         object().sight().setup(CSightAction(SightManager::eSightTypePathDirection, true, true));
@@ -544,21 +544,14 @@ void CStalkerActionTakeCover::execute()
         m_storage->set_property(eWorldPropertyInCover, true);
     }
 
-    //Don't shoot if enemy not visible for longer than 3 seconds
-    u32 last_time_seen = object().memory().visual().visible_object_time_last_seen(enemy);
-    if (last_time_seen != u32(-1) && Device.dwTimeGlobal - last_time_seen <= 3000 && fire_make_sense())
-    {
-        fire();
-    }
-    else
-        aim_ready();
-
     if (object().memory().visual().visible_now(enemy))
     {
-        object().sight().setup(CSightAction(object().memory().enemy().selected(), true, true));
+        object().sight().setup(CSightAction(enemy, true, true));
+        fire();
     }
     else
     {
+        aim_ready();
         if (_abs(object().Position().y - mem_object.m_object_params.m_position.y) > 3.5f)
         {
             Fvector3 Vpos = { mem_object.m_object_params.m_position.x, object().Position().y + 1.f, mem_object.m_object_params.m_position.z };
@@ -724,13 +717,6 @@ void CStalkerActionHoldPosition::execute()
     inherited::execute();
 
     //Alundaio: Cleaned up
-    /*
-        Possible TODO : This action is a good place to prevent stalkers staring at walls.
-        A simple ray query each execute can do the trick by rotating the stalker until
-        the differences between the last query and new query are larger than some defined threshold.
-        This way you can detect edges of walls and would give the illusion of stalkers looking at corridors or chokepoints instead of through a wall.
-    */
-
     const CEntityAlive* enemy = object().memory().enemy().selected();
     if (!enemy)
         return;

src/xrGame/stalker_property_evaluators.cpp

@@ -211,13 +211,12 @@ CStalkerPropertyEvaluatorReadyToKill::CStalkerPropertyEvaluatorReadyToKill(
 
 _value_type CStalkerPropertyEvaluatorReadyToKill::evaluate()
 {
-    if (!m_object->ready_to_kill())
+    if (!m_object->ready_to_kill() || !m_object->best_weapon())
         return (false);
 
     if (!m_min_ammo_count)
         return (true);
 
-    VERIFY(m_object->best_weapon());
     CWeapon& best_weapon = smart_cast<CWeapon&>(*m_object->best_weapon());
     if (best_weapon.GetAmmoElapsed() <= (int)m_min_ammo_count)
     {

src/xrGame/ui/UIActorMenuInventory.cpp

@@ -738,6 +738,12 @@ bool CUIActorMenu::ToQuickSlot(CUICellItem* itm)
     if (!eat_item)
         return false;
 
+    //Alundaio: Prevent icons greater then 1x1 to be quick slotted
+    Ivector2 iWH = iitem->GetInvGridRect().rb;
+    if (iWH.x > 1 || iWH.y > 1)
+        return false;
+    //Alundaio: END
+
     u8 slot_idx = u8(m_pQuickSlot->PickCell(GetUICursor().GetCursorPosition()).x);
     if (slot_idx == 255)
         return false;