Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-30 11:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix collision code getting stuck if speed is 0

Browse Source
This commit is contained in:
Perttu Ahola 2012-04-07 19:19:36 +03:00
parent 7281c68b27
commit e879c92596
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/collision.cpp
View File

@ -29,6 +29,10 @@ collisionMoveResult collisionMoveSimple(Map *map, IGameDef *gamedef,
{ {
collisionMoveResult result; collisionMoveResult result;
// If there is no speed, there are no collisions
if(speed_f.getLength() == 0)
return result;
v3f oldpos_f = pos_f; v3f oldpos_f = pos_f;
v3s16 oldpos_i = floatToInt(oldpos_f, BS); v3s16 oldpos_i = floatToInt(oldpos_f, BS);
@ -197,6 +201,10 @@ collisionMoveResult collisionMovePrecise(Map *map, IGameDef *gamedef,
{ {
collisionMoveResult final_result; collisionMoveResult final_result;
// If there is no speed, there are no collisions
if(speed_f.getLength() == 0)
return final_result;
// Maximum time increment (for collision detection etc) // Maximum time increment (for collision detection etc)
// time = distance / speed // time = distance / speed
f32 dtime_max_increment = pos_max_d / speed_f.getLength(); f32 dtime_max_increment = pos_max_d / speed_f.getLength();