diff options
| author | Choupom <andycootlapin@hotmail.fr> | 2011-06-02 12:03:34 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-06-11 18:34:05 +0200 |
| commit | c1ebda73e3ca383e0c612da7dd3d341a51fe070b (patch) | |
| tree | 4736630e9cb4bf60b0236894de5a562242849620 /src/game/server | |
| parent | 558b110504af146322d36cc7ac0e65bd2e408e99 (diff) | |
| download | zcatch-c1ebda73e3ca383e0c612da7dd3d341a51fe070b.tar.gz zcatch-c1ebda73e3ca383e0c612da7dd3d341a51fe070b.zip | |
fixed #687 Bug with the ctf score when the round starts, fixed so you can't grab the flag if the game is over
Diffstat (limited to 'src/game/server')
| -rw-r--r-- | src/game/server/gamemodes/ctf.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
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]; |