diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index 0cca55387e1b518016faab9f0925fbc2b88c2b41..6a8d63ca9f944573bc507dfa267677c89f19aa8e 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
begin
if a.Spectator then Result := 1
else if b.Spectator then Result := -1
- else if a.Frags < b.Frags then Result := 1
- else if a.Frags > b.Frags then Result := -1
- else if a.Deaths < b.Deaths then Result := -1
- else if a.Deaths > b.Deaths then Result := 1
- else if a.Kills < b.Kills then Result := -1
- else Result := 1;
+ else if a.Assists < b.Assists then Result := 1
+ else if a.Assists > b.Assists then Result := -1
+ else if a.Frags < b.Frags then Result := 1
+ else if a.Frags > b.Frags then Result := -1
+ else if a.Deaths < b.Deaths then Result := -1
+ else if a.Deaths > b.Deaths then Result := 1
+ else if a.Kills < b.Kills then Result := -1
+ else Result := 1;
end;
procedure SortGameStat(var stat: TPlayerStatArray);
WriteLn(s,
Format('mon_killed,mon_total,secrets_found,secrets_total' + LineEnding + '%d,%d,%d,%d',[gCoopMonstersKilled, gTotalMonsters, gCoopSecretsFound, gSecretsCount]));
// lines 3-...: team, player name, frags, deaths
- WriteLn(s, 'team,name,frags,deaths');
+ WriteLn(s, 'team,name,frags,assists,deaths');
for I := Low(Stat.PlayerStat) to High(Stat.PlayerStat) do
with Stat.PlayerStat[I] do
- WriteLn(s, Format('%d,%s,%d,%d', [Team, dquoteStr(Name), Frags, Deaths]));
+ WriteLn(s, Format('%d,%s,%d,%d', [Team, dquoteStr(Name), Frags, Assists, Deaths]));
except
g_Console_Add(Format(_lc[I_CONSOLE_ERROR_WRITE], [fname]));
end;
Num := a;
Name := gPlayers[a].Name;
Frags := gPlayers[a].Frags;
+ Assists := gPlayers[a].Assists;
Deaths := gPlayers[a].Death;
Kills := gPlayers[a].Kills;
Team := gPlayers[a].Team;
e_TextureFontPrintEx(x+w1+16, _y, Format(_lc[I_GAME_PING_MS], [Ping, Loss]), gStdFont, rr, gg, bb, 1);
// Ôðàãè
e_TextureFontPrintEx(x+w1+w2+16, _y, IntToStr(Frags), gStdFont, rr, gg, bb, 1);
+ // Àññèñòû
+ e_TextureFontPrintEx(x+w1+w2+48, _y, IntToStr(Assists), gStdFont, rr, gg, bb, 1);
// Ñìåðòè
e_TextureFontPrintEx(x+w1+w2+w3+16, _y, IntToStr(Deaths), gStdFont, rr, gg, bb, 1);
_y := _y+ch;
else
e_TextureFontPrintEx(x+16, _y, Name, gStdFont, rr, gg, bb, 1);
e_TextureFontPrintEx(x+w1+16, _y, IntToStr(Frags), gStdFont, rr, gg, bb, 1);
- e_TextureFontPrintEx(x+w1+w2+16, _y, IntToStr(Deaths), gStdFont, rr, gg, bb, 1);
+ e_TextureFontPrintEx(x+w1+w2+16, _y, IntToStr(Assists), gStdFont, rr, gg, bb, 1);
+ e_TextureFontPrintEx(x+w1+w2+w3+16, _y, IntToStr(Deaths), gStdFont, rr, gg, bb, 1);
_y := _y+24;
end;
if gGameSettings.GameMode = GM_COOP then
begin
gPlayers[i].Frags := 0;
+ gPlayers[i].Assists := 0;
gPlayers[i].RecallState;
end;
if (gPlayer1 = nil) and (gSpectLatchPID1 > 0) then