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

CaptureTheFlag: Fix wrong relaunch calls

alut-include-path
Fulgen301 2017-03-30 14:00:09 +02:00
parent db6047c22a
commit 9b04051e65
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
planet/Objects.ocd/Goals.ocd/CaptureTheFlag.ocd/Script.c
View File

@ -77,7 +77,6 @@ private func EliminateOthers(int win_team)
protected func InitializePlayer(int plr, int x, int y, object base, int team)
{
// Join new clonk.
GetRelaunchRule()->InitializePlayer(plr);
GetRelaunchRule()->DoRelaunch(iPlr, nil, RelaunchPosition(team), true);
// make scoreboard entry for team
@ -85,12 +84,7 @@ protected func InitializePlayer(int plr, int x, int y, object base, int team)
return _inherited(plr, x, y, base, team, ...);
}
protected func RelaunchPlayer(int plr)
{
return GetRelaunchRule()->RelaunchPlayer(plr);
}
private func RelaunchPosition(int iTeam)
public func RelaunchPosition(int iTeam)
{
var base = FindObject(Find_ID(Goal_FlagBase), Find_Func("FindTeam", team));
if (base) return [base->GetX(), base->GetY() - 10];