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

Fix sequence and dialogue progress mode saving

console-destruction
Sven Eberhardt 2016-08-27 17:17:48 -04:00
parent 065d8536da
commit 147e70ace9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
planet/Objects.ocd/Helpers.ocd/Dialogue.ocd/Script.c
View File

@ -531,7 +531,7 @@ func SaveScenarioObject(props)
props->Remove("Plane"); // updated when setting dialogue
props->Add(SAVEOBJ_Creation, "%s->SetDialogue(%v,%v)", dlg_target->MakeScenarioSaveName(), dlg_name, !!dlg_attention);
// Set properties
if (user_dialogue || user_dialogue_progress_mode || user_dialogue_allow_parallel) props->AddCall("UserDialogue", this, "SetUserDialogue", user_dialogue, user_dialogue_progress_mode, user_dialogue_allow_parallel);
if (user_dialogue || user_dialogue_progress_mode || user_dialogue_allow_parallel) props->AddCall("UserDialogue", this, "SetUserDialogue", user_dialogue, Format("%v", user_dialogue_progress_mode), user_dialogue_allow_parallel);
if (!dlg_interact) props->AddCall("Enabled", this, "SetEnabled", dlg_interact);
// Force dependency on all contained objects, so dialogue initialization procedure can access them
var i=0, obj;

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

@ -680,7 +680,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, action_progress_mode, action_allow_parallel);
if (action || 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;
}