From c1ebda73e3ca383e0c612da7dd3d341a51fe070b Mon Sep 17 00:00:00 2001 From: Choupom Date: Thu, 2 Jun 2011 12:03:34 +0200 Subject: fixed #687 Bug with the ctf score when the round starts, fixed so you can't grab the flag if the game is over --- src/game/server/gamemodes/ctf.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/game') diff --git a/src/game/server/gamemodes/ctf.cpp b/src/game/server/gamemodes/ctf.cpp index d019f395..58087c86 100644 --- a/src/game/server/gamemodes/ctf.cpp +++ b/src/game/server/gamemodes/ctf.cpp @@ -117,8 +117,14 @@ void CGameControllerCTF::Tick() { IGameController::Tick(); + if(GameServer()->m_World.m_ResetRequested) + return; + DoTeamScoreWincheck(); + if(GameServer()->m_World.m_Paused) + return; + for(int fi = 0; fi < 2; fi++) { CFlag *F = m_apFlags[fi]; -- cgit 1.4.1