Skip to content

Commit

Permalink
Handle another rare glitch
Browse files Browse the repository at this point in the history
  • Loading branch information
bl0ckeduser committed May 30, 2012
1 parent ab85b85 commit c47cedb
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
Binary file modified clown3d-DS.nds
Binary file not shown.
9 changes: 8 additions & 1 deletion collisions.c
Expand Up @@ -284,6 +284,12 @@ void resolveCollisions(game_obj* objs, void (*handler)(void*, void*))
}
collision_found2:

if(ratio == 0.0 && (x_offs || y_offs || z_offs)) {
/* very rare glitch. setup the edge-evasion
bits as if there was a conflict. */
node->ee_bits = 6;
}


/* Simple edge-evasion, based on PypeBros' suggestion.
When a collision occurs, a request is made to add the
Expand All @@ -296,7 +302,8 @@ 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 */
as if there was a conflict to block
edge-evasion */
node->ee_bits = 6;
}
edge_evade(node, node2, 0);
Expand Down

0 comments on commit c47cedb

Please sign in to comment.