marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix extra slot object check in object interaction menu

objectmenu
Sven Eberhardt 2016-01-17 22:15:23 -05:00
parent f6583ee754
commit eb333bd8db
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
planet/Objects.ocd/HUD.ocd/ObjectInteractionMenu.ocd/Script.c
View File

@ -159,8 +159,8 @@ func FxIntCheckObjectsTimer(target, effect fx)
var new_objects = FindObjects(Find_AtRect(target->GetX() - 5, target->GetY() - 10, 10, 20), container_restriction, Find_Layer(target->GetObjectLayer()),
// Find all containers and objects with a custom menu.
Find_Or(Find_Func("IsContainer"), Find_Func("HasInteractionMenu")),
// Do not show objects with an extra slot though - even if they are containers. They count as items here.
Find_Not(Find_And(Find_Category(C4D_Object), Find_Func("HasExtraSlots"))),
// Do not show objects with an extra slot though - even if they are containers. They count as items here and can be accessed via the surroundings tab.
Find_Not(Find_And(Find_Property("Collectible"), Find_Func("HasExtraSlot"))),
// Show only objects that the player can see.
Find_Func("CheckVisibility", GetOwner()),
// Normally sorted by z-order. But some objects may have a lower priority.