forked from Mirrors/openclonk
arena goals: pass whether it is a relaunch to OnPlayerRelaunch callback
parent
7ca791a5b0
commit
97cc3dd901
|
@ -81,7 +81,7 @@ protected func InitializePlayer(int plr, int x, int y, object base, int team)
|
||||||
Scoreboard->NewEntry(ScoreboardTeamID(team), GetTaggedTeamName(team));
|
Scoreboard->NewEntry(ScoreboardTeamID(team), GetTaggedTeamName(team));
|
||||||
|
|
||||||
// Broadcast to scenario.
|
// Broadcast to scenario.
|
||||||
GameCall("OnPlayerRelaunch", plr);
|
GameCall("OnPlayerRelaunch", plr, false);
|
||||||
return _inherited(plr, ...);
|
return _inherited(plr, ...);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -94,7 +94,7 @@ protected func RelaunchPlayer(int plr)
|
||||||
// Join new clonk.
|
// Join new clonk.
|
||||||
JoinPlayer(plr);
|
JoinPlayer(plr);
|
||||||
// Broadcast to scenario.
|
// Broadcast to scenario.
|
||||||
GameCall("OnPlayerRelaunch", plr);
|
GameCall("OnPlayerRelaunch", plr, true);
|
||||||
return _inherited(plr, ...);
|
return _inherited(plr, ...);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ protected func InitializePlayer(int plr)
|
||||||
// Join plr.
|
// Join plr.
|
||||||
JoinPlayer(plr);
|
JoinPlayer(plr);
|
||||||
// Scenario script callback.
|
// Scenario script callback.
|
||||||
GameCall("OnPlayerRelaunch", plr);
|
GameCall("OnPlayerRelaunch", plr, false);
|
||||||
return _inherited(plr, ...);
|
return _inherited(plr, ...);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@ protected func RelaunchPlayer(int plr, int killer)
|
||||||
SetCursor(plr, clonk);
|
SetCursor(plr, clonk);
|
||||||
JoinPlayer(plr);
|
JoinPlayer(plr);
|
||||||
// Scenario script callback.
|
// Scenario script callback.
|
||||||
GameCall("OnPlayerRelaunch", plr);
|
GameCall("OnPlayerRelaunch", plr, true);
|
||||||
// Show scoreboard for a while
|
// Show scoreboard for a while
|
||||||
DoScoreboardShow(1, plr + 1);
|
DoScoreboardShow(1, plr + 1);
|
||||||
Schedule(this,Format("DoScoreboardShow(-1, %d)", plr + 1), 35 * MIME_ShowBoardTime);
|
Schedule(this,Format("DoScoreboardShow(-1, %d)", plr + 1), 35 * MIME_ShowBoardTime);
|
||||||
|
|
|
@ -58,7 +58,7 @@ protected func InitializePlayer(int plr)
|
||||||
// Join plr.
|
// Join plr.
|
||||||
JoinPlayer(plr);
|
JoinPlayer(plr);
|
||||||
// Scenario script callback.
|
// Scenario script callback.
|
||||||
GameCall("OnPlayerRelaunch", plr, GetRelaunchCount(plr));
|
GameCall("OnPlayerRelaunch", plr, false);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -87,7 +87,7 @@ protected func RelaunchPlayer(int plr, int killer)
|
||||||
SetCursor(plr, clonk);
|
SetCursor(plr, clonk);
|
||||||
JoinPlayer(plr);
|
JoinPlayer(plr);
|
||||||
// Scenario script callback.
|
// Scenario script callback.
|
||||||
GameCall("OnPlayerRelaunch", plr, GetRelaunchCount(plr));
|
GameCall("OnPlayerRelaunch", plr, true);
|
||||||
// Show scoreboard for a while.
|
// Show scoreboard for a while.
|
||||||
DoScoreboardShow(1, plr + 1);
|
DoScoreboardShow(1, plr + 1);
|
||||||
Schedule(this,Format("DoScoreboardShow(-1, %d)", plr + 1), 35 * MIME_ShowBoardTime);
|
Schedule(this,Format("DoScoreboardShow(-1, %d)", plr + 1), 35 * MIME_ShowBoardTime);
|
||||||
|
|
Loading…
Reference in New Issue