From 97cc3dd90187aac39fda57b1a77ef892204ddb61 Mon Sep 17 00:00:00 2001 From: Maikel de Vries Date: Sat, 2 Jan 2016 21:53:43 +0100 Subject: [PATCH] arena goals: pass whether it is a relaunch to OnPlayerRelaunch callback --- planet/Objects.ocd/Goals.ocd/CaptureTheFlag.ocd/Script.c | 4 ++-- planet/Objects.ocd/Goals.ocd/DeathMatch.ocd/Script.c | 4 ++-- planet/Objects.ocd/Goals.ocd/LastManStanding.ocd/Script.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/planet/Objects.ocd/Goals.ocd/CaptureTheFlag.ocd/Script.c b/planet/Objects.ocd/Goals.ocd/CaptureTheFlag.ocd/Script.c index d3ba7c4bf..e3a734b79 100644 --- a/planet/Objects.ocd/Goals.ocd/CaptureTheFlag.ocd/Script.c +++ b/planet/Objects.ocd/Goals.ocd/CaptureTheFlag.ocd/Script.c @@ -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, ...); } diff --git a/planet/Objects.ocd/Goals.ocd/DeathMatch.ocd/Script.c b/planet/Objects.ocd/Goals.ocd/DeathMatch.ocd/Script.c index 68825ccc9..061d01b45 100644 --- a/planet/Objects.ocd/Goals.ocd/DeathMatch.ocd/Script.c +++ b/planet/Objects.ocd/Goals.ocd/DeathMatch.ocd/Script.c @@ -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); diff --git a/planet/Objects.ocd/Goals.ocd/LastManStanding.ocd/Script.c b/planet/Objects.ocd/Goals.ocd/LastManStanding.ocd/Script.c index 7f27e2599..62c5a5b13 100644 --- a/planet/Objects.ocd/Goals.ocd/LastManStanding.ocd/Script.c +++ b/planet/Objects.ocd/Goals.ocd/LastManStanding.ocd/Script.c @@ -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);