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

Fix save as scenario for Dialogue. 

Add GameCall as fallback mechanism for dialog implementation if no local function is defined.
Controls
Sven Eberhardt 2014-02-08 22:48:36 +01:00
parent 44ffc5c470
commit 13a60848c6
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,7 +157,8 @@ public func Interact(object clonk)
var progress = dlg_progress;
dlg_progress++;
// Then call relevant functions.
Call(Format("Dlg_%s_%d", dlg_name, progress), clonk);
if (!Call(Format("Dlg_%s_%d", dlg_name, progress), clonk))
GameCall(Format("Dlg_%s_%d", dlg_name, progress), this, clonk, dlg_target);
return true;
}
@ -218,6 +219,22 @@ public func MenuOK(proplist menu_id, object clonk)
Interact(clonk);
}
/* Scenario saving */
// Scenario saving
func SaveScenarioObject(props)
{
if (!inherited(props, ...)) return false;
if (!dlg_target) return false; // don't save dead dialogue object
// Dialog has its own creation procedure
props->RemoveCreation();
props->Add(SAVEOBJ_Creation, "%s->SetDialogue(%v)", dlg_target->MakeScenarioSaveName(), dlg_name);
return true;
}
/* Properties */
local ActMap = {
Dialogue = {
Prototype = Action,