X-Git-Url: https://git.rohieb.name/hackover2013-badge-firmware.git/blobdiff_plain/4cb2d309b35bc7acc33483bdcd0af2a749206369..5813966ca98e7d5f2eabe69b5d0683fbc83720b1:/badge/jumpnrun/collision.c

diff --git a/badge/jumpnrun/collision.c b/badge/jumpnrun/collision.c
index 34ab099..2b946f2 100644
--- a/badge/jumpnrun/collision.c
+++ b/badge/jumpnrun/collision.c
@@ -1,9 +1,9 @@
 #include "collision.h"
 
 void collision_displace(vec2d             *desired_pos,
-			jumpnrun_moveable *current,
-			rectangle   const *obstacle,
-			vec2d             *inertia_mod) {
+                        jumpnrun_moveable *current,
+                        rectangle   const *obstacle,
+                        vec2d             *inertia_mod) {
   rectangle desired = current->current_box;
   rectangle_move_to(&desired, *desired_pos);
 
@@ -23,8 +23,8 @@ void collision_displace(vec2d             *desired_pos,
     dy =                 rectangle_bottom(obstacle);
 
   } else if(fixed_point_gt(rectangle_bottom( obstacle), rectangle_bottom(&desired)) &&
-	    fixed_point_le(rectangle_top   ( obstacle), rectangle_bottom(&desired)) &&
-	    fixed_point_gt(rectangle_top   (&desired ), rectangle_top   (&current->current_box))) {
+            fixed_point_le(rectangle_top   ( obstacle), rectangle_bottom(&desired)) &&
+            fixed_point_gt(rectangle_top   (&desired ), rectangle_top   (&current->current_box))) {
 
     y  = fixed_point_sub(rectangle_bottom(&desired ), rectangle_top   ( obstacle));
     dy = fixed_point_sub(rectangle_top   ( obstacle), rectangle_height(&desired ));
@@ -32,7 +32,6 @@ void collision_displace(vec2d             *desired_pos,
 
   }
 
-
   if(fixed_point_le(rectangle_left ( obstacle), rectangle_left(&desired)) &&
      fixed_point_gt(rectangle_right( obstacle), rectangle_left(&desired)) &&
      fixed_point_lt(rectangle_left (&desired ), rectangle_left(&current->current_box))) {
@@ -41,8 +40,8 @@ void collision_displace(vec2d             *desired_pos,
     dx =                 rectangle_right(obstacle);
 
   } else if(fixed_point_gt(rectangle_right( obstacle), rectangle_right(&desired)) &&
-	    fixed_point_le(rectangle_left ( obstacle), rectangle_right(&desired)) &&
-	    fixed_point_gt(rectangle_left (&desired ), rectangle_left (&current->current_box))) {
+            fixed_point_le(rectangle_left ( obstacle), rectangle_right(&desired)) &&
+            fixed_point_gt(rectangle_left (&desired ), rectangle_left (&current->current_box))) {
 
     x  = fixed_point_sub(rectangle_right(&desired ), rectangle_left ( obstacle));
     dx = fixed_point_sub(rectangle_left ( obstacle), rectangle_width(&desired ));
@@ -66,14 +65,14 @@ void collision_displace(vec2d             *desired_pos,
 }
 
 void collisions_tiles_displace(vec2d                     *desired_position,
-			       jumpnrun_moveable         *thing,
-			       jumpnrun_level      const *lv,
-			       jumpnrun_tile_range const *visible_tiles,
-			       vec2d                     *inertia_mod)
+                               jumpnrun_moveable         *thing,
+                               jumpnrun_level      const *lv,
+                               jumpnrun_tile_range const *visible_tiles,
+                               vec2d                     *inertia_mod)
 {
   int collision_tile[] = { -1, -1, -1,
-			   -1, -1, -1,
-			   -1, -1, -1
+                           -1, -1, -1,
+                           -1, -1, -1
   };
   static int const collision_order[] = { 7, 1, 3, 5, 6, 8, 0, 2 };
 
@@ -94,32 +93,32 @@ void collisions_tiles_displace(vec2d                     *desired_position,
 
     switch(xdiff) {
     case -1:
-      {
-	switch(ydiff) {
-	case -1: collision_tile[0] = tile; break;
-	case  0: collision_tile[1] = tile; break;
-	case  1: collision_tile[2] = tile; break;
-	}
-	break;
+    {
+      switch(ydiff) {
+      case -1: collision_tile[0] = tile; break;
+      case  0: collision_tile[1] = tile; break;
+      case  1: collision_tile[2] = tile; break;
       }
+      break;
+    }
     case  0:
-      {
-	switch(ydiff) {
-	case -1: collision_tile[3] = tile; break;
-	case  0: collision_tile[4] = tile; break;
-	case  1: collision_tile[5] = tile; break;
-	}
-	break;
+    {
+      switch(ydiff) {
+      case -1: collision_tile[3] = tile; break;
+      case  0: collision_tile[4] = tile; break;
+      case  1: collision_tile[5] = tile; break;
       }
+      break;
+    }
     case  1:
-      {
-	switch(ydiff) {
-	case -1: collision_tile[6] = tile; break;
-	case  0: collision_tile[7] = tile; break;
-	case  1: collision_tile[8] = tile; break;
-	}
-	break;
+    {
+      switch(ydiff) {
+      case -1: collision_tile[6] = tile; break;
+      case  0: collision_tile[7] = tile; break;
+      case  1: collision_tile[8] = tile; break;
       }
+      break;
+    }
     }
   }
 
@@ -130,7 +129,7 @@ void collisions_tiles_displace(vec2d                     *desired_position,
     if(collision_tile[collision_order[collision_index]] == -1) {
       continue;
     }
-	   
+
     rectangle tile_rect = rect_from_tile(&lv->tiles[collision_tile[collision_order[collision_index]]]);
 
     collision_displace(desired_position, thing, &tile_rect, inertia_mod);