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

Added OnClonkEnteredRelaunch when the clonk enters the relaunch container (in accordance to OnClonkLeftRelaunch), request by the Knüppeln team. 

I also use this commit to shamefully hide the bugfix of the bug I previously committed.
install-platforms
Clonkonaut 2017-07-07 00:52:23 +02:00
parent 1144837e7e
commit c2f1d47f63
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
planet/Objects.ocd/Rules.ocd/Relaunch.ocd/RelaunchContainer.ocd/Script.c
View File

@ -39,8 +39,9 @@ public func StartRelaunch(object clonk)
// Save clonk for later use.
crew = clonk;
clonk->Enter(this);
ScheduleCall(this, "OpenWeaponMenu", 36, 0, clonk);
AddEffect("IntTimeLimit", this, 100, 36, this);
ScheduleCall(this, "OpenWeaponMenu", 36, 0, clonk);
GameCall("OnClonkEnteredRelaunch", clonk, clonk->GetOwner());
return true;
}

2
planet/Objects.ocd/Rules.ocd/Relaunch.ocd/Script.c
View File

@ -241,7 +241,7 @@ public func OnClonkDeath(object clonk, int killer)
return;
}
}
if (GameCall("OnPlayerRelaunch", plr, true));
if (GameCall("OnPlayerRelaunch", plr, true))
return;
return DoRelaunch(plr, clonk, nil);
}