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

Fix the logic again 

Otherwise you can exit containers without an entrance area.
master
Mark 2018-12-21 09:56:19 +01:00
parent b35a58a7fc
commit 9deab8e6a9
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
planet/Objects.ocd/Libraries.ocd/ClonkInteractionControl.ocd/Script.c
View File

@ -435,10 +435,11 @@ func GetInteractableObjects(array sort)
}
// Can be entered or exited?
var can_be_exited = interactable == Contained();
var can_be_entered = interactable->GetOCF() & OCF_Entrance;
var has_entrance = interactable->GetOCF() & OCF_Entrance;
var can_be_exited = has_entrance && uses_container;
// Check if object shape overlaps with entrance area.
if (can_be_entered)
var can_be_entered = false;
if (has_entrance)
{
var entrance = interactable->GetEntranceRectangle();
var shape = GetShape();
@ -453,7 +454,7 @@ func GetInteractableObjects(array sort)
can_be_entered &= (interactable->~IsContainer() || interactable->~AllowsVehicleEntrance());
}
}
if (can_be_exited || (can_be_entered && !can_only_use_container))
if (has_entrance && ((can_be_entered && !can_only_use_container) || can_be_exited))
{
var priority = 29;
if (can_be_exited)