Gracefully handle rare glitch

bl0ckeduser · May 30, 2012 · ab85b85 · ab85b85
1 parent e09bed1
commit ab85b85
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/clown3d-DS.nds b/clown3d-DS.nds
diff --git a/collisions.c b/collisions.c
@@ -284,6 +284,7 @@ void resolveCollisions(game_obj* objs, void (*handler)(void*, void*))
 				}
 collision_found2:
 
+
 				/* Simple edge-evasion, based on PypeBros' suggestion. 
 				   When a collision occurs, a request is made to add the  
 				   the projection of the player's move vector on the "wall direction" 
@@ -293,10 +294,20 @@ void resolveCollisions(game_obj* objs, void (*handler)(void*, void*))
 				 */
 
 				if(which == 3) {
+					if(react.x == 0) {
+						/* rare glitch. setup the EE bits
+						   as if there was a conflict */
+						node->ee_bits = 6;
+					}
 					edge_evade(node, node2, 0);
 					ee = 1;
 				}
 				if(which == 1) {
+					if(react.z == 0) {
+						/* rare glitch. setup the EE bits
+						   as if there was a conflict */
+						node->ee_bits = 6;
+					}
 					edge_evade(node, node2, 1);
 					ee = 1;
 				}