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

interactions: do not show cycle message for interactions with a single object

install-platforms
Maikel de Vries 2017-12-01 17:47:39 +01:00
parent 9eb2478b2c
commit 4abac1c6d6
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,7 +190,7 @@ private func SetNextInteraction(proplist to)
RemoveEffect(nil, this, e);
// And set & mark new one.
this.control.interaction_hud_controller->SetCurrentInteraction(to);
var interaction_cnt = GetLength(GetInteractableObjects());
var interaction_cnt = GetInteractableObjectsCount();
if (to)
AddEffect("IntHighlightInteraction", this, 1, 2, this, nil, to, interaction_cnt);
}
@ -467,6 +467,17 @@ func GetInteractableObjects(array sort)
return possible_interactions;
}
// Returns the number of interactable objects, which is different from the total number of available interactions.
private func GetInteractableObjectsCount()
{
var interactions = GetInteractableObjects();
var interaction_objects = [];
for (var interaction in interactions)
PushBack(interaction_objects, interaction.interaction_object);
RemoveDuplicates(interaction_objects);
return GetLength(interaction_objects);
}
// executes interaction with an object. /action_info/ is a proplist as returned by GetInteractableObjects
func ExecuteInteraction(proplist action_info)
{