Fixed bug told in the mailing list:

[supertux.git] / src / special.cpp

diff --git a/src/special.cpp b/src/special.cpp
index 4eed304..b287476 100644 (file)
--- a/src/special.cpp
+++ b/src/special.cpp
@@ -45,6 +45,7 @@ Sprite* img_1up;
 void
 Bullet::init(float x, float y, float xm, Direction dir)
 {
+  life_count = 3;
   base.width = 4;
   base.height = 4;
 
@@ -99,16 +100,17 @@ Bullet::action(double frame_ratio)
         base.ym = 9;
       else if (base.ym < -9)
         base.ym = -9;
+      life_count -= 1;
     }
 
   base.ym = base.ym + 0.5 * frame_ratio;
 
   if (base.x < scroll_x ||
       base.x > scroll_x + screen->w ||
-      base.y < 0 ||
       base.y > screen->h ||
       issolid(base.x + 4, base.y + 2) ||
-      issolid(base.x, base.y + 2))
+      issolid(base.x, base.y + 2) ||
+      life_count <= 0)
     {
       remove_me();
     }
@@ -190,8 +192,12 @@ Upgrade::action(double frame_ratio)
     }
   }
 
-  /* Off screen? Kill it! */
-  if(base.x < scroll_x - base.width || base.y > screen->h) {
+  /* Away from the screen? Kill it! */
+  if(base.x < scroll_x - OFFSCREEN_DISTANCE) {
+      remove_me();
+      return;
+  }
+  if(base.y > screen->h) {
     remove_me();
     return;
   }
@@ -285,10 +291,32 @@ Upgrade::draw()
 }
 
 void
-Upgrade::collision(void* p_c_object, int c_object)
+Upgrade::bump(Player* )
+{
+  // these can't be bumped
+  if(kind != UPGRADE_GROWUP)
+    return;
+
+  play_sound(sounds[SND_BUMP_UPGRADE], SOUND_CENTER_SPEAKER);
+  
+  // do a little jump and change direction
+  physic.set_velocity(-physic.get_velocity_x(), 3);
+  dir = dir == LEFT ? RIGHT : LEFT;
+  physic.enable_gravity(true);
+}
+
+void
+Upgrade::collision(void* p_c_object, int c_object, CollisionType type)
 {
   Player* pplayer = NULL;
 
+  if(type == COLLISION_BUMP) {
+    if(c_object == CO_PLAYER)
+      pplayer = (Player*) p_c_object;
+    bump(pplayer);
+    return;
+  }
+
   switch (c_object)
     {
     case CO_PLAYER:
@@ -316,9 +344,12 @@ Upgrade::collision(void* p_c_object, int c_object)
         {
           play_sound(sounds[SND_COFFEE], SOUND_CENTER_SPEAKER);
           pplayer->got_coffee = true;
-          pplayer->size = BIG;
-          pplayer->base.height = 64;
-         pplayer->base.y -= 32;
+          if (pplayer->size == SMALL)
+            {
+              pplayer->size = BIG;
+              pplayer->base.height = 64;
+              pplayer->base.y -= 32;
+            }
          if(collision_object_map(pplayer->base))
             {
               pplayer->base.height = 32;
@@ -357,6 +388,5 @@ void load_special_gfx()
 
 void free_special_gfx()
 {
-  delete img_bullet;
 }