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

arena goals: pass whether it is a relaunch to OnPlayerRelaunch callback

shapetextures
Maikel de Vries 2016-01-02 21:53:43 +01:00
parent 7ca791a5b0
commit 97cc3dd901
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,7 @@ protected func InitializePlayer(int plr, int x, int y, object base, int team)
Scoreboard->NewEntry(ScoreboardTeamID(team), GetTaggedTeamName(team));
// Broadcast to scenario.
GameCall("OnPlayerRelaunch", plr);
GameCall("OnPlayerRelaunch", plr, false);
return _inherited(plr, ...);
}
@ -94,7 +94,7 @@ protected func RelaunchPlayer(int plr)
// Join new clonk.
JoinPlayer(plr);
// Broadcast to scenario.
GameCall("OnPlayerRelaunch", plr);
GameCall("OnPlayerRelaunch", plr, true);
return _inherited(plr, ...);
}

4
planet/Objects.ocd/Goals.ocd/DeathMatch.ocd/Script.c
View File

@ -31,7 +31,7 @@ protected func InitializePlayer(int plr)
// Join plr.
JoinPlayer(plr);
// Scenario script callback.
GameCall("OnPlayerRelaunch", plr);
GameCall("OnPlayerRelaunch", plr, false);
return _inherited(plr, ...);
}
@ -43,7 +43,7 @@ protected func RelaunchPlayer(int plr, int killer)
SetCursor(plr, clonk);
JoinPlayer(plr);
// Scenario script callback.
GameCall("OnPlayerRelaunch", plr);
GameCall("OnPlayerRelaunch", plr, true);
// Show scoreboard for a while
DoScoreboardShow(1, plr + 1);
Schedule(this,Format("DoScoreboardShow(-1, %d)", plr + 1), 35 * MIME_ShowBoardTime);

4
planet/Objects.ocd/Goals.ocd/LastManStanding.ocd/Script.c
View File

@ -58,7 +58,7 @@ protected func InitializePlayer(int plr)
// Join plr.
JoinPlayer(plr);
// Scenario script callback.
GameCall("OnPlayerRelaunch", plr, GetRelaunchCount(plr));
GameCall("OnPlayerRelaunch", plr, false);
return;
}
@ -87,7 +87,7 @@ protected func RelaunchPlayer(int plr, int killer)
SetCursor(plr, clonk);
JoinPlayer(plr);
// Scenario script callback.
GameCall("OnPlayerRelaunch", plr, GetRelaunchCount(plr));
GameCall("OnPlayerRelaunch", plr, true);
// Show scoreboard for a while.
DoScoreboardShow(1, plr + 1);
Schedule(this,Format("DoScoreboardShow(-1, %d)", plr + 1), 35 * MIME_ShowBoardTime);