Skip to content

Commit

Permalink
Collision temporary fix for issue #6886
Browse files Browse the repository at this point in the history
  • Loading branch information
TheTermos authored and sfan5 committed Jan 27, 2020
1 parent 60544ac commit 908e762
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions src/collision.cpp
Expand Up @@ -415,12 +415,11 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
Collision uncertainty radius
Make it a bit larger than the maximum distance of movement
*/
f32 d = pos_max_d * 1.1f;
// A fairly large value in here makes moving smoother
//f32 d = 0.15*BS;
//f32 d = pos_max_d * 1.1f;

// This should always apply, otherwise there are glitches
assert(d > pos_max_d); // invariant
f32 d = 0.01f; // Temporary fix, any nonzero d causes collision glitches, the more the greater it is.
// ultimately it has to be determined if any uncertainty is involved, and if it is, eliminated
// and d & pos_max_d params removed from function calls.

int loopcount = 0;

Expand Down

0 comments on commit 908e762

Please sign in to comment.