diff options
| author | Fujnky <larsfunke1996@gmail.com> | 2010-06-03 17:47:32 +0200 |
|---|---|---|
| committer | Fujnky <larsfunke1996@gmail.com> | 2010-06-03 17:47:32 +0200 |
| commit | 5849aeb86c5ae41fc83e6f8e5583b65a117d7114 (patch) | |
| tree | 0801cb063a54c94fd9f142f328476330849eb7e8 /src/game/server/gamemodes/ctf.h | |
| parent | 5a641132e7d445157434b8af0c73947d2cef987f (diff) | |
| parent | a6ab379e67f712524635cac1c8131314933b8f59 (diff) | |
| download | zcatch-5849aeb86c5ae41fc83e6f8e5583b65a117d7114.tar.gz zcatch-5849aeb86c5ae41fc83e6f8e5583b65a117d7114.zip | |
Merge branch 'master' of git://github.com/matricks/teeworlds
Conflicts: src/game/server/gamemodes/ctf.cpp
Diffstat (limited to 'src/game/server/gamemodes/ctf.h')
| -rw-r--r-- | src/game/server/gamemodes/ctf.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game/server/gamemodes/ctf.h b/src/game/server/gamemodes/ctf.h index afb6feee..16c6097a 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; @@ -36,3 +36,4 @@ public: virtual void Snap(int SnappingClient); }; #endif + |