Добавил проверку на блокирование слота ( например на лестнице и тп )

Co-Authored-By: Laucer7 <38085008+laucer7@users.noreply.github.com>
OGSR · Apr 30, 2021 · fd2a9d7 · fd2a9d7
1 parent 1bd3815
commit fd2a9d7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/ogsr_engine/xrGame/Inventory.cpp b/ogsr_engine/xrGame/Inventory.cpp
@@ -1279,3 +1279,11 @@ PIItem CInventory::GetAmmoMinCurr( const char *name, bool forActor ) const {
 
   return box;
 }
+
+
+bool CInventory::IsActiveSlotBlocked() const {
+	for (const auto& slot : m_slots)
+		if (slot.CanBeActivated())
+			return false;
+	return true;
+}
diff --git a/ogsr_engine/xrGame/Inventory.h b/ogsr_engine/xrGame/Inventory.h
@@ -146,6 +146,7 @@ class CInventory
 	void				InvalidateState				()							{ m_dwModifyFrame = Device.dwFrame; }
 	void				Items_SetCurrentEntityHud	(bool current_entity);
 	bool				isBeautifulForActiveSlot	(CInventoryItem *pIItem);
+	bool IsActiveSlotBlocked() const;
 
 	// максимальный вес инвентаря
 	float				m_fMaxWeight;

diff --git a/ogsr_engine/xrGame/derived_client_classes.cpp b/ogsr_engine/xrGame/derived_client_classes.cpp
@@ -243,6 +243,8 @@ void CInventoryScript::script_register(lua_State *L)
 			.property	  ("active_item"				,			&inventory_active_item)
 			.property	  ("selected_item"				,			&inventory_selected_item)
 			.property	  ("target"						,			&get_inventory_target)
+			.def("is_active_slot_blocked", &CInventory::IsActiveSlotBlocked)
+
 			//.property	  ("class_name"					,			&get_lua_class_name)
 			//.def		  ("to_belt"					,			&item_to_slot,   raw(_2))
 			//.def		  ("to_slot"					,			&item_to_slot,   raw(_2))