diff options
| author | xalduin <xalduin@gmail.com> | 2010-06-03 13:32:15 -0400 |
|---|---|---|
| committer | xalduin <xalduin@gmail.com> | 2010-06-03 13:32:15 -0400 |
| commit | 8b15558f5d8e51d76a4d74254d2173297db61082 (patch) | |
| tree | ac331fa8f6fcfc081454114eb5ed133ee1cac540 /src/game/server/gamemodes/ctf.h | |
| parent | 3fff61d24aebd77dc6feb289595620e114730c86 (diff) | |
| parent | 551170656d84ebdc4e801bc0187b397646ea3c3b (diff) | |
| download | zcatch-8b15558f5d8e51d76a4d74254d2173297db61082.tar.gz zcatch-8b15558f5d8e51d76a4d74254d2173297db61082.zip | |
Merge remote branch 'upstream/master
Diffstat (limited to 'src/game/server/gamemodes/ctf.h')
| -rw-r--r-- | src/game/server/gamemodes/ctf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/server/gamemodes/ctf.h b/src/game/server/gamemodes/ctf.h index afb6feee..767207e0 100644 --- a/src/game/server/gamemodes/ctf.h +++ b/src/game/server/gamemodes/ctf.h @@ -20,7 +20,7 @@ public: class CFlag : public CEntity { public: - static const int m_PhysSize = 14; + static const int ms_PhysSize = 14; CCharacter *m_pCarryingCharacter; vec2 m_Vel; vec2 m_StandPos; |