diff options
| author | oy <Tom_Adams@web.de> | 2011-01-19 18:27:50 +0100 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-01-19 18:27:50 +0100 |
| commit | 19a9462fe88b2573ab9f24a2890d4affb2bdcf47 (patch) | |
| tree | 699ea43000384716ef42843b2f2a7f33010f9a67 /src/game/server/gamemodes | |
| parent | 7ca7c95bc0d29aca731838d9c404c038cbc15599 (diff) | |
| download | zcatch-19a9462fe88b2573ab9f24a2890d4affb2bdcf47.tar.gz zcatch-19a9462fe88b2573ab9f24a2890d4affb2bdcf47.zip | |
removed double entity list in gameworld and cleaned up connected stuff
Diffstat (limited to 'src/game/server/gamemodes')
| -rw-r--r-- | src/game/server/gamemodes/ctf.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/server/gamemodes/ctf.cpp b/src/game/server/gamemodes/ctf.cpp index f6681ff6..6cefe435 100644 --- a/src/game/server/gamemodes/ctf.cpp +++ b/src/game/server/gamemodes/ctf.cpp @@ -139,7 +139,7 @@ void CGameControllerCTF::Tick() else { CCharacter *apCloseCCharacters[MAX_CLIENTS]; - int Num = GameServer()->m_World.FindEntities(F->m_Pos, CFlag::ms_PhysSize, (CEntity**)apCloseCCharacters, MAX_CLIENTS, NETOBJTYPE_CHARACTER); + int Num = GameServer()->m_World.FindEntities(F->m_Pos, CFlag::ms_PhysSize, (CEntity**)apCloseCCharacters, MAX_CLIENTS, CGameWorld::ENTTYPE_CHARACTER); for(int i = 0; i < Num; i++) { if(!apCloseCCharacters[i]->IsAlive() || apCloseCCharacters[i]->GetPlayer()->GetTeam() == TEAM_SPECTATORS || GameServer()->Collision()->IntersectLine(F->m_Pos, apCloseCCharacters[i]->m_Pos, NULL, NULL)) |