Merge pull request #431 from sapier/dtime_clamping

add limit for (collision handling) steps to avoid runaway memory consumption
2013-02-22 16:42:50 -08:00 · 2013-02-22 16:42:50 -08:00 · f9a8efb992
parent 7f240aea1e 12e9f3d010
commit f9a8efb992
1 changed files with 4 additions and 0 deletions
--- a/src/collision.cpp
+++ b/src/collision.cpp
@ -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