-optimized and cleaned up collision_object_map

[supertux.git] / src / player.cpp

diff --git a/src/player.cpp b/src/player.cpp
index 6298cc5..afc4eb5 100644 (file)
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -371,7 +371,7 @@ Player::handle_horizontal_input()
 void
 Player::handle_vertical_input()
 {
-  if(input.up == DOWN)
+  if(input.up == DOWN && input.old_up == UP)
     {
       if (on_ground())
         {
@@ -410,6 +410,7 @@ Player::handle_input()
     {
       handle_vertical_input();
     }
+  input.old_up = input.up;
 
   /* Shoot! */
 
@@ -455,11 +456,25 @@ Player::handle_input()
       duck = false;
       base.y -= 32;
       base.height = 64;
-      old_base = previous_base = base;
+      // changing base size confuses collision otherwise
+      old_base = previous_base = base;                        
     }
 }
 
 void
+Player::grow()
+{
+  if(size == BIG)
+    return;
+  
+  size = BIG;
+  base.height = 64;
+  base.y -= 32;
+
+  old_base = previous_base = base;
+}
+
+void
 Player::grabdistros()
 {
   /* Grab distros: */
@@ -510,13 +525,13 @@ Player::draw()
           else
             sprite = &largetux;
           
-          if (duck)
+          if (duck && size != SMALL)
             {
               if (dir == RIGHT)
                 sprite->duck_right->draw(base.x - scroll_x, base.y);
               else 
                 sprite->duck_left->draw(base.x - scroll_x, base.y);
-            }                    
+            }
           else if (skidding_timer.started())
             {
               if (dir == RIGHT)
@@ -631,7 +646,7 @@ Player::collision(void* p_c_object, int c_object)
                 }
               else
                 {
-                  pbad_c->kill_me();
+                  pbad_c->kill_me(25);
                 }
             }
           player_status.score_multiplier++;