diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-01-20 15:19:30 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-01-20 15:19:30 +0000 |
| commit | 805a74c1e4e487c1fabafc57858cd591e6dfed9d (patch) | |
| tree | de66fae77a698b34420a8f24e4bd93ba69cf5274 /src/game/server | |
| parent | f63bcc8673ddab0520faf34276dfa9141c609102 (diff) | |
| download | zcatch-805a74c1e4e487c1fabafc57858cd591e6dfed9d.tar.gz zcatch-805a74c1e4e487c1fabafc57858cd591e6dfed9d.zip | |
fixed collision bug with player <-> player
Diffstat (limited to 'src/game/server')
| -rw-r--r-- | src/game/server/gs_server.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/game/server/gs_server.cpp b/src/game/server/gs_server.cpp index 31b1975e..914fd8e1 100644 --- a/src/game/server/gs_server.cpp +++ b/src/game/server/gs_server.cpp @@ -1312,14 +1312,6 @@ void player::tick_defered() vec2 start_vel = core.vel; bool stuck_before = test_box(core.pos, vec2(28.0f, 28.0f)); - // TODO: this should be moved into the g_game - // but not done to preserve the nethash - if(length(core.vel) > 150.0f) - { - dbg_msg("server", "insane move! clamping (%f,%f) %f", core.vel.x, core.vel.y, length(core.vel)); - core.vel = normalize(core.vel) * 150.0f; - } - core.move(); bool stuck_after_move = test_box(core.pos, vec2(28.0f, 28.0f)); core.quantize(); |