diff options
| author | oy <Tom_Adams@web.de> | 2011-08-06 13:57:59 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-08-06 13:57:59 +0200 |
| commit | de05682d87429f99d42e74986032d9c26037eae5 (patch) | |
| tree | 11dbcd5fc02707db5da231de5be3ecdfcb3a6704 | |
| parent | 003c0aa28132ade7b89ba5ed001bf819c8d0d381 (diff) | |
| download | zcatch-de05682d87429f99d42e74986032d9c26037eae5.tar.gz zcatch-de05682d87429f99d42e74986032d9c26037eae5.zip | |
fixed play hooking when tune player_collision is 0. Closes #825
| -rw-r--r-- | scripts/cmd5.py | 2 | ||||
| -rw-r--r-- | src/game/gamecore.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/cmd5.py b/scripts/cmd5.py index 9b4804c7..5ac4cd45 100644 --- a/scripts/cmd5.py +++ b/scripts/cmd5.py @@ -30,6 +30,6 @@ for filename in sys.argv[1:]: hash = hashlib.md5(f).hexdigest().lower()[16:] #TODO 0.7: improve nethash creation -if hash == "63d6e69c6025feff": +if hash == "3dc531e4296de555": hash = "626fce9a778df4d4" print('#define GAME_NETVERSION_HASH "%s"' % hash) diff --git a/src/game/gamecore.cpp b/src/game/gamecore.cpp index af086df2..d43492ac 100644 --- a/src/game/gamecore.cpp +++ b/src/game/gamecore.cpp @@ -302,7 +302,7 @@ void CCharacterCore::Tick(bool UseInput) } } - if(m_pWorld && m_pWorld->m_Tuning.m_PlayerCollision) + if(m_pWorld) { for(int i = 0; i < MAX_CLIENTS; i++) { @@ -317,7 +317,7 @@ void CCharacterCore::Tick(bool UseInput) // handle player <-> player collision float Distance = distance(m_Pos, pCharCore->m_Pos); vec2 Dir = normalize(m_Pos - pCharCore->m_Pos); - if(Distance < PhysSize*1.25f && Distance > 0.0f) + if(m_pWorld->m_Tuning.m_PlayerCollision && Distance < PhysSize*1.25f && Distance > 0.0f) { float a = (PhysSize*1.45f - Distance); float Velocity = 0.5f; @@ -332,7 +332,7 @@ void CCharacterCore::Tick(bool UseInput) } // handle hook influence - if(m_HookedPlayer == i) + if(m_HookedPlayer == i && m_pWorld->m_Tuning.m_PlayerHooking) { if(Distance > PhysSize*1.50f) // TODO: fix tweakable variable { |