forked from Mirrors/openclonk
Fix sequence and dialogue progress mode saving
parent
065d8536da
commit
147e70ace9
|
@ -531,7 +531,7 @@ func SaveScenarioObject(props)
|
||||||
props->Remove("Plane"); // updated when setting dialogue
|
props->Remove("Plane"); // updated when setting dialogue
|
||||||
props->Add(SAVEOBJ_Creation, "%s->SetDialogue(%v,%v)", dlg_target->MakeScenarioSaveName(), dlg_name, !!dlg_attention);
|
props->Add(SAVEOBJ_Creation, "%s->SetDialogue(%v,%v)", dlg_target->MakeScenarioSaveName(), dlg_name, !!dlg_attention);
|
||||||
// Set properties
|
// 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);
|
if (!dlg_interact) props->AddCall("Enabled", this, "SetEnabled", dlg_interact);
|
||||||
// Force dependency on all contained objects, so dialogue initialization procedure can access them
|
// Force dependency on all contained objects, so dialogue initialization procedure can access them
|
||||||
var i=0, obj;
|
var i=0, obj;
|
||||||
|
|
|
@ -680,7 +680,7 @@ public func SaveScenarioObject(props, ...)
|
||||||
if (!active) props->AddCall("Active", this, "SetActive", active);
|
if (!active) props->AddCall("Active", this, "SetActive", active);
|
||||||
if (trigger) props->AddCall("Trigger", this, "SetTrigger", trigger);
|
if (trigger) props->AddCall("Trigger", this, "SetTrigger", trigger);
|
||||||
if (condition) props->AddCall("Condition", this, "SetCondition", condition);
|
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);
|
if (deactivate_after_action) props->AddCall("DeactivateAfterAction", this, "SetDeactivateAfterAction", deactivate_after_action);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue