From 5ee4dc1fec60964593e1c7cec92ab72f0568afa6 Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Sun, 9 Dec 2007 09:47:05 +0000 Subject: bug fixes in team games --- src/game/server/srv_common.cpp | 2 ++ src/game/server/srv_ctf.cpp | 4 ++++ 2 files changed, 6 insertions(+) (limited to 'src') 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) { -- cgit 1.4.1