diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-10-03 21:32:02 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-10-03 21:32:02 +0000 |
| commit | a67738e9801a4485cfaf68012279cd5042dc2ab9 (patch) | |
| tree | 5a4fa1db378b9b889b73b66ff9ac974fdc141dca /src/game/server/srv_tdm.cpp | |
| parent | 30a7246f2fd5e2141de2c37f01b491abe374f3f9 (diff) | |
| download | zcatch-a67738e9801a4485cfaf68012279cd5042dc2ab9.tar.gz zcatch-a67738e9801a4485cfaf68012279cd5042dc2ab9.zip | |
general fixes. fixed scoreboard
Diffstat (limited to 'src/game/server/srv_tdm.cpp')
| -rw-r--r-- | src/game/server/srv_tdm.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/game/server/srv_tdm.cpp b/src/game/server/srv_tdm.cpp index ca1a5a67..3ed35dca 100644 --- a/src/game/server/srv_tdm.cpp +++ b/src/game/server/srv_tdm.cpp @@ -7,22 +7,23 @@ void gameobject_tdm::tick() if(game_over_tick == -1) { // game is running + teamscore[0] = 0; + teamscore[1] = 0; // gather some stats - int totalscore[2] = {0,0}; int topscore_count = 0; for(int i = 0; i < MAX_CLIENTS; i++) { if(players[i].client_id != -1) - totalscore[players[i].team] += players[i].score; + teamscore[players[i].team] += players[i].score; } - if (totalscore[0] >= config.scorelimit) + if (teamscore[0] >= config.scorelimit) topscore_count++; - if (totalscore[1] >= config.scorelimit) + if (teamscore[1] >= config.scorelimit) topscore_count++; // check score win condition - if((config.scorelimit > 0 && (totalscore[0] >= config.scorelimit || totalscore[1] >= config.scorelimit)) || + if((config.scorelimit > 0 && (teamscore[0] >= config.scorelimit || teamscore[1] >= config.scorelimit)) || (config.timelimit > 0 && (server_tick()-round_start_tick) >= config.timelimit*server_tickspeed()*60)) { if(topscore_count == 1) |