Skip to content
Permalink
Browse files

Revert collision tweaks #9365 and #9327 (#9591)

This reverts commit df74d36.
This reverts commit 908e762.

Restores the original collision detection bugs to release 5.2.0 prior the large collision detection fix.
  • Loading branch information
SmallJoker committed Apr 4, 2020
1 parent 86a0e99 commit d5c441253669c9f88dea948d261e0d8934d28fb9
Showing with 5 additions and 5 deletions.
  1. +5 −5 src/collision.cpp
@@ -415,12 +415,12 @@ 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;
f32 d = pos_max_d * 1.1f;
// A fairly large value in here makes moving smoother
//f32 d = 0.15*BS;


f32 d = 0.3f; // 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.
// This should always apply, otherwise there are glitches
assert(d > pos_max_d); // invariant

int loopcount = 0;

0 comments on commit d5c4412

Please sign in to comment.
You can’t perform that action at this time.