about summary refs log tree commit diff
path: root/src/game/server/gamemodes
diff options
context:
space:
mode:
authoroy <Tom_Adams@web.de>2010-09-22 01:07:11 +0200
committeroy <Tom_Adams@web.de>2010-09-22 01:07:11 +0200
commit12233ecdaf16236ee6b3a4d836d37560fe33297d (patch)
tree0f7dde209f00f600781952b0c161bb4276050843 /src/game/server/gamemodes
parent68ed9154aea6b56c17db58cdbda806b7b428f885 (diff)
downloadzcatch-12233ecdaf16236ee6b3a4d836d37560fe33297d.tar.gz
zcatch-12233ecdaf16236ee6b3a4d836d37560fe33297d.zip
fixed that ctf gametype doesn't work if the map has more than 1 flag per team. Closes #124
Diffstat (limited to 'src/game/server/gamemodes')
-rw-r--r--src/game/server/gamemodes/ctf.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/server/gamemodes/ctf.cpp b/src/game/server/gamemodes/ctf.cpp
index 0bbc9e85..2c348df2 100644
--- a/src/game/server/gamemodes/ctf.cpp
+++ b/src/game/server/gamemodes/ctf.cpp
@@ -23,7 +23,7 @@ bool CGameControllerCTF::OnEntity(int Index, vec2 Pos)
 	int Team = -1;
 	if(Index == ENTITY_FLAGSTAND_RED) Team = 0;
 	if(Index == ENTITY_FLAGSTAND_BLUE) Team = 1;
-	if(Team == -1)
+	if(Team == -1 || m_apFlags[Team])
 		return false;
 		
 	CFlag *F = new CFlag(&GameServer()->m_World, Team);