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

parkour: players respawn at best team checkpoint

stable-6.1
Maikel de Vries 2015-05-18 20:14:29 +02:00
parent 939888e9d2
commit 2dd4b50313
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
planet/Objects.ocd/Goals.ocd/Parkour.ocd/Script.c
View File

@ -383,7 +383,7 @@ protected func InitializePlayer(int plr, int x, int y, object base, int team)
DoScoreboardShow(1, plr + 1); DoScoreboardShow(1, plr + 1);
JoinPlayer(plr); JoinPlayer(plr);
// Scenario script callback. // Scenario script callback.
GameCall("OnPlayerRespawn", plr, respawn_list[plr]); GameCall("OnPlayerRespawn", plr, FindRespawnCP(plr));
return; return;
} }
@ -395,7 +395,7 @@ protected func RelaunchPlayer(int plr)
SetCursor(plr, clonk); SetCursor(plr, clonk);
JoinPlayer(plr); JoinPlayer(plr);
// Scenario script callback. // Scenario script callback.
GameCall("OnPlayerRespawn", plr, respawn_list[plr]); GameCall("OnPlayerRespawn", plr, FindRespawnCP(plr));
// Log message. // Log message.
Log(RndRespawnMsg(), GetPlayerName(plr)); Log(RndRespawnMsg(), GetPlayerName(plr));
return; return;
@ -416,9 +416,30 @@ protected func JoinPlayer(int plr)
return; return;
} }
private func FindRespawnCP(int plr)
{
var best_cp = respawn_list[plr];
var team = GetPlayerTeam(plr);
if (!team)
return best_cp;
// Loop over team members to find a better checkpoint.
for (var i = 0; i < GetPlayerCount(); i++)
{
var test_plr = GetPlayerByIndex(i);
if (GetPlayerTeam(test_plr) == team)
{
var test_cp = respawn_list[test_plr];
if (test_cp->GetCPNumber() && test_cp->GetCPNumber() > best_cp->GetCPNumber())
best_cp = test_cp;
}
}
return best_cp;
}
private func FindRespawnPos(int plr) private func FindRespawnPos(int plr)
{ {
return [respawn_list[plr]->GetX(), respawn_list[plr]->GetY()]; var cp = FindRespawnCP(plr);
return [cp->GetX(), cp->GetY()];
} }
protected func RemovePlayer(int plr) protected func RemovePlayer(int plr)