diff options
| author | oy <Tom_Adams@web.de> | 2013-02-24 18:55:55 +0100 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2013-02-24 18:55:55 +0100 |
| commit | 0e92dd560300a0b255b5c173e715f2714e7c1765 (patch) | |
| tree | cc261eadddbd707b56dd018757c251a578a98384 /src/game/server | |
| parent | 118d2ac837537cd625679a57aca03cd47f2e71a1 (diff) | |
| download | zcatch-0e92dd560300a0b255b5c173e715f2714e7c1765.tar.gz zcatch-0e92dd560300a0b255b5c173e715f2714e7c1765.zip | |
fixed some merge problems
Diffstat (limited to 'src/game/server')
| -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 9e45c1fe..140dadf9 100644 --- a/src/game/server/gamemodes/ctf.cpp +++ b/src/game/server/gamemodes/ctf.cpp @@ -98,7 +98,7 @@ bool CGameControllerCTF::CanBeMovedOnBalance(int ClientID) for(int fi = 0; fi < 2; fi++) { CFlag *F = m_apFlags[fi]; - if(F->m_pCarryingCharacter == Character) + if(F && F->m_pCarryingCharacter == Character) return false; } } |