diff options
| author | Weblate <42@minetest.ru> | 2013-04-07 13:39:28 +0200 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-04-07 13:39:28 +0200 |
| commit | feb7de91ec34ef1ca3152270a7bc62b2e308f1bd (patch) | |
| tree | 65c33378bae9b7ac565b979237b6d594b511171f /src/collision.cpp | |
| parent | 33052abf42886ef03c4f46196cab6f767259a672 (diff) | |
| parent | 4468ea84e6d0faede5a01e8d97d359c537aa7ec8 (diff) | |
| download | minetest-feb7de91ec34ef1ca3152270a7bc62b2e308f1bd.tar.gz minetest-feb7de91ec34ef1ca3152270a7bc62b2e308f1bd.tar.bz2 minetest-feb7de91ec34ef1ca3152270a7bc62b2e308f1bd.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'src/collision.cpp')
| -rw-r--r-- | src/collision.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/collision.cpp b/src/collision.cpp index 806a3b720..cd170196f 100644 --- a/src/collision.cpp +++ b/src/collision.cpp @@ -209,10 +209,15 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef, } speed_f += accel_f * dtime; - // If there is no speed, there are no collisions + // If there is no speed, there are no collisions if(speed_f.getLength() == 0) return result; + // Limit speed for avoiding hangs + speed_f.Y=rangelim(speed_f.Y,-5000,5000); + speed_f.X=rangelim(speed_f.X,-5000,5000); + speed_f.Z=rangelim(speed_f.Z,-5000,5000); + /* Collect node boxes in movement range */ |