Merge remote-tracking branch 'origin/main' into main

amel-unity · amel-unity · commit 807a7957b9e3 · 2021-07-14T19:09:03.000+02:00
diff --git a/UOP1_Project/Assets/Scripts/UI/Inventory/UIInventory.cs b/UOP1_Project/Assets/Scripts/UI/Inventory/UIInventory.cs
@@ -328,7 +328,7 @@ void UnselectItem(int itemIndex)
 	}
 	void UpdateInventory()
 	{
-		FillInventory(_selectedTab.TabType);
+		FillInventory(_selectedTab.TabType, _isNearPot);
 	}
 
 	void OnActionButtonClicked()
@@ -397,7 +397,7 @@ void CookRecipe(ItemSO recipeToCook)
 	void OnChangeTab(InventoryTabSO tabType)
 	{
 
-		FillInventory(tabType.TabType);
+		FillInventory(tabType.TabType, _isNearPot);
 
 	}
 	public void CloseInventory()

Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ void UnselectItem(int itemIndex)`
`328`	`328`	`}`
`329`	`329`	`void UpdateInventory()`
`330`	`330`	`{`
`331`		`- FillInventory(_selectedTab.TabType);`
	`331`	`+ FillInventory(_selectedTab.TabType, _isNearPot);`
`332`	`332`	`}`
`333`	`333`
`334`	`334`	`void OnActionButtonClicked()`
`@@ -397,7 +397,7 @@ void CookRecipe(ItemSO recipeToCook)`
`397`	`397`	`void OnChangeTab(InventoryTabSO tabType)`
`398`	`398`	`{`
`399`	`399`
`400`		`- FillInventory(tabType.TabType);`
	`400`	`+ FillInventory(tabType.TabType, _isNearPot);`
`401`	`401`
`402`	`402`	`}`
`403`	`403`	`public void CloseInventory()`