From f3ddb2d5d85007a72fd41dd7b4d1d970007a4744 Mon Sep 17 00:00:00 2001 From: bl0ckeduser Date: Tue, 29 May 2012 00:16:08 -0400 Subject: [PATCH] Fix collision jitter --- TODO | 2 +- clown3d-DS.nds | Bin 285760 -> 285760 bytes collisions.c | 2 +- player.c | 6 ++++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/TODO b/TODO index 6f1fb42..adaf29e 100644 --- a/TODO +++ b/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 diff --git a/clown3d-DS.nds b/clown3d-DS.nds index 30329d764446215b587d74d9fb26687d8f5d383c..55795b43ffecd767c67dd93a0fa7216bdeb5ce07 100644 GIT binary patch delta 16231 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 == 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; diff --git a/player.c b/player.c index 3f86032..0450717 100644 --- a/player.c +++ b/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 */