diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-11-26 20:47:49 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-11-26 20:47:49 +0000 |
| commit | ddbb7e0b0ea20a115b556b99577e7de07cd703d4 (patch) | |
| tree | 2c10d2df6fc76bd4eb3288963a109cb02656eecb /src/game/server/srv_tdm.cpp | |
| parent | 61041e483797e02525547757f75007edceabc0f3 (diff) | |
| download | zcatch-ddbb7e0b0ea20a115b556b99577e7de07cd703d4.tar.gz zcatch-ddbb7e0b0ea20a115b556b99577e7de07cd703d4.zip | |
fixed tdm and ctf scoring
Diffstat (limited to 'src/game/server/srv_tdm.cpp')
| -rw-r--r-- | src/game/server/srv_tdm.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/game/server/srv_tdm.cpp b/src/game/server/srv_tdm.cpp index 3595a129..bcae397f 100644 --- a/src/game/server/srv_tdm.cpp +++ b/src/game/server/srv_tdm.cpp @@ -26,18 +26,7 @@ int gameobject_tdm::on_player_death(class player *victim, class player *killer, void gameobject_tdm::tick() { - if(game_over_tick == -1 && !warmup) - { - // check score win condition - 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(teamscore[0] != teamscore[0]) - endround(); - else - sudden_death = 1; - } - } + do_team_wincheck(); gameobject::tick(); } |