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

Allow non-editor collection of objects by dialogue helper object 

Also revert Clonkonaut's crash landing into hotfix
ipv6
Sven Eberhardt 2017-01-01 17:00:33 -05:00
parent d46f98fd7b
commit 8cd2432c58
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
planet/Missions.ocf/Crash.ocs/System.ocg/SeqIntro.c
View File

@ -46,7 +46,6 @@ func Intro_JoinPlayer(int plr)
var crew;
for(var index = 0; crew = GetCrew(plr, index); ++index)
{
Log("%v", this.dialogue);
crew->Enter(this.dialogue);
}
return true;
@ -161,7 +160,7 @@ func Intro_16()
this.pilot->Exit();
Intro_CreateBoompack(RandomX(x-5,x+5), RandomX(y-5,y+5), 160)->Launch(290 + Random(26), this.pilot);
var clonk;
while(clonk = this.pilot->Contents())
while(clonk = this.dialogue->Contents())
{
clonk->Exit();
Intro_CreateBoompack(RandomX(x-5,x+5), RandomX(y-5,y+5), 160)->Launch(290 + Random(26), clonk);

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

@ -717,7 +717,7 @@ private func GetDefaultMessageProp(object target_object)
}
// Editor object drop happens easily - so move stuff directly to target
public func Collection2(obj)
public func EditorCollection(obj)
{
if (dlg_target && obj) obj->Enter(dlg_target);
if (dlg_target && obj) obj->Enter(dlg_target);
}