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

Sequence: Default action to empty sequence

directional-lights
Sven Eberhardt 2016-10-09 12:31:41 -04:00
parent 2957a777b3
commit b0e42e35d1
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
planet/Objects.ocd/Helpers.ocd/Sequence.ocd/Script.c
View File

@ -360,6 +360,13 @@ public func IsSequence() { return true; }
// Note that this flag is not saved in scenarios, so saving as scenario and reloading will re-enable all triggers (for editor mode)
local finished;
public func Initialize()
{
// The default action is an empty sequence, because that's usually what the user wants
// Must init this in initialize to force a writable array
action = { Function="sequence", Actions=[] };
}
public func Definition(def)
{
// EditorActions
@ -713,7 +720,7 @@ public func SaveScenarioObject(props, ...)
if (!active) props->AddCall("Active", this, "SetActive", active);
if (trigger) props->AddCall("Trigger", this, "SetTrigger", trigger);
if (condition) props->AddCall("Condition", this, "SetCondition", condition);
if (action || action_progress_mode || action_allow_parallel) props->AddCall("Action", this, "SetAction", action, Format("%v", action_progress_mode), action_allow_parallel);
if ((action && !DeepEqual(action, { Function="sequence", Actions=[] })) || action_progress_mode || action_allow_parallel) props->AddCall("Action", this, "SetAction", action, Format("%v", action_progress_mode), action_allow_parallel);
if (deactivate_after_action) props->AddCall("DeactivateAfterAction", this, "SetDeactivateAfterAction", deactivate_after_action);
return true;
}