Fix collision jitter

TODO

@@ -30,7 +30,7 @@
 + Get the default world to load on the real console.
 
 
-- Fix the collision resolve jitter.
++ Fix the collision resolve jitter.
    (I must confess that I've seen in it in a professional
     3d DS game once though)
 - Test the new edge-evasion code

collisions.c

@@ -276,7 +276,7 @@ void resolveCollisions(game_obj* objs, void (*handler)(void*, void*))
 				   earlier collision calculations) is added for edge evasion. */
 				if(node->type == PLAYER && which == 3) {
 					node->box.min.x += move.x;
-					node->box.max.x += move.x;					
+					node->box.max.x += move.x;
 				}
 				if(node->type == PLAYER && which == 1) {
 					node->box.min.z += move.z;

player.c

@@ -184,10 +184,12 @@ void playerCollide(game_obj* a, game_obj* b)
 		   it results from movement on the 
 		   Y axis */
 
-		a->data[PLAYER_X] = a->box.min.x + 10;
+		if(a->box.move.y == 0)
+			a->data[PLAYER_X] = a->box.min.x + 10;
 		if(a->box.move.y != 0)
 			a->data[PLAYER_Y] = a->box.min.y + 10;
-		a->data[PLAYER_Z] = a->box.min.z + 10;
+		if(a->box.move.y == 0)
+			a->data[PLAYER_Z] = a->box.min.z + 10;
 
 	} else if(b->type == KEY && b->data[KEY_EXISTS]) {
 		/* Pick up a key */