diff options
| author | Weblate <42@minetest.ru> | 2013-02-28 18:03:28 +0100 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-02-28 18:03:28 +0100 |
| commit | 22e186b4aa88b585e71500c4e9a03bf69b0b6191 (patch) | |
| tree | 14c5b7a73cf144ba7cf3066caac088a200f81a72 /src/collision.cpp | |
| parent | 372acf7b8eca0614a4a0da93cfbaccbcd459b36b (diff) | |
| parent | d31f07bd4b83f858cce589faac56922e12ba670f (diff) | |
| download | minetest-22e186b4aa88b585e71500c4e9a03bf69b0b6191.tar.gz minetest-22e186b4aa88b585e71500c4e9a03bf69b0b6191.tar.bz2 minetest-22e186b4aa88b585e71500c4e9a03bf69b0b6191.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'src/collision.cpp')
| -rw-r--r-- | src/collision.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/collision.cpp b/src/collision.cpp index 143b559fa..58517b779 100644 --- a/src/collision.cpp +++ b/src/collision.cpp @@ -1,6 +1,6 @@ /* -Minetest-c55 -Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com> +Minetest +Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com> This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -199,6 +199,10 @@ collisionMoveResult collisionMoveSimple(Map *map, IGameDef *gamedef, /* Calculate new velocity */ + if( dtime > 0.5 ) { + infostream<<"collisionMoveSimple: WARNING: maximum step interval exceeded, lost movement details!"<<std::endl; + dtime = 0.5; + } speed_f += accel_f * dtime; // If there is no speed, there are no collisions |