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

Objects: Fixed deathmatch elimination 

Not sure what it was supposed to do, but player 0 won a round with less than max_kills kills.
Maikel de Vries 2011-10-11 00:57:34 +02:00
parent 7b3ff34eea
commit 5df61780d4
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,22 +90,22 @@ private func FindRelaunchPos(int plr)
public func IsFulfilled()
{
//Check whether someone has reached the limit
var fulfilled = CreateArray();
for(var i = GetPlayerCount() - 1; i > -1; --i)
// Check whether someone has reached the limit.
var winner = nil;
for (var i = 0; i < GetPlayerCount(); i++)
if(GetKillCount(GetPlayerByIndex(i)) >= maxkills)
fulfilled[GetLength(fulfilled)] = i;
if(!GetLength(fulfilled)) return false;
//Eliminate all players, that are not in a team with one of the winners
for(var i = GetPlayerCount() - 1; i > -1; --i)
winner = GetPlayerByIndex(i);
if (winner == nil)
return false;
// Eliminate all players, that are not in a team with one of the winners
for (var i = 0; i < GetPlayerCount(); i++)
{
var eliminate = true;
for(var j = GetLength(fulfilled); j; --j)
{
if(fulfilled[j] == i) {eliminate = false; break;}
if(!CheckTeamHostile(GetPlayerByIndex(fulfilled[j]), GetPlayerByIndex(i))) {eliminate = false; break;}
}
if(eliminate) EliminatePlayer(GetPlayerByIndex(i));
var plr = GetPlayerByIndex(i);
if (winner == plr)
continue;
if (!CheckTeamHostile(winner, plr))
continue;
EliminatePlayer(plr);
}
return true;
}