diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-12-09 09:47:05 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-12-09 09:47:05 +0000 |
| commit | 5ee4dc1fec60964593e1c7cec92ab72f0568afa6 (patch) | |
| tree | f996e17d0fe65a257302e0ed345283914d71d11b | |
| parent | 482058e60c12af02d47d56409009084a405cdbf9 (diff) | |
| download | zcatch-5ee4dc1fec60964593e1c7cec92ab72f0568afa6.tar.gz zcatch-5ee4dc1fec60964593e1c7cec92ab72f0568afa6.zip | |
bug fixes in team games
| -rw-r--r-- | src/game/server/srv_common.cpp | 2 | ||||
| -rw-r--r-- | src/game/server/srv_ctf.cpp | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/game/server/srv_common.cpp b/src/game/server/srv_common.cpp index f76e1e51..1c338897 100644 --- a/src/game/server/srv_common.cpp +++ b/src/game/server/srv_common.cpp @@ -30,6 +30,8 @@ gameobject::gameobject() round_start_tick = server_tick(); round_count = 0; is_teamplay = false; + teamscore[0] = 0; + teamscore[1] = 0; } void gameobject::endround() diff --git a/src/game/server/srv_ctf.cpp b/src/game/server/srv_ctf.cpp index 81f1bb84..04cf5d30 100644 --- a/src/game/server/srv_ctf.cpp +++ b/src/game/server/srv_ctf.cpp @@ -20,6 +20,7 @@ gameobject_ctf::gameobject_ctf() else { // report massive failure + flags[i] = 0; } } @@ -64,6 +65,9 @@ void gameobject_ctf::tick() { flag *f = flags[fi]; + if(!f) + continue; + // if(f->carrying_player) { |