X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fspecial.cpp;h=594bce30962980c350375f50002c22850f4d1706;hb=e2e9c115fa08a7a22a5e0fd2d2dc451b81524a56;hp=bcbd2a841c4d1238dc9bd09073eb43a786b2ea8e;hpb=f07a22ebe858958ba3f68bf55195474c9afe1e05;p=supertux.git

diff --git a/src/special.cpp b/src/special.cpp
index bcbd2a841..594bce309 100644
--- a/src/special.cpp
+++ b/src/special.cpp
@@ -51,6 +51,9 @@ Bullet::Bullet(const Vector& pos, float xm, int dir, int kind_)
   life_count = 3;
   base.width = 4;
   base.height = 4;
+  
+  if (kind == ICE_BULLET)
+    life_count = 6; //ice-bullets get "extra lives" for bumping off walls
 
   if (dir == RIGHT)
     {
@@ -102,12 +105,20 @@ Bullet::action(float elapsed_time)
       base.x > scroll_x + screen->w ||
       base.y < scroll_y ||
       base.y > scroll_y + screen->h ||
-      issolid(base.x + 4, base.y + 2) ||
-      issolid(base.x, base.y + 2) ||
       life_count <= 0)
     {
       remove_me();
     }
+  if (issolid(base.x + 4, base.y + 2) || 
+      issolid(base.x, base.y + 2))
+     {
+       if (kind == FIRE_BULLET)
+         remove_me();
+       else if (kind == ICE_BULLET)
+         {
+	   physic.set_velocity_x(physic.get_velocity_x() * -1);
+	 }
+     }
 }
 
 void 
@@ -268,13 +279,18 @@ Upgrade::bump(Player* player)
   sound_manager->play_sound(sounds[SND_BUMP_UPGRADE], Vector(base.x, base.y));
   
   // determine new direction
+  Direction old_dir = dir;
   if (player->base.x + player->base.width/2 > base.x + base.width/2)
     dir = LEFT;
   else
     dir = RIGHT;
 
-  // do a little jump and change direction
-  physic.set_velocity(-physic.get_velocity_x(), 3);
+  // do a little jump and change direction (if necessary)
+  if (dir != old_dir)
+    physic.set_velocity(-physic.get_velocity_x(), 3);
+  else
+    physic.set_velocity_y(3);
+
   physic.enable_gravity(true);
 }
 
@@ -356,8 +372,8 @@ void load_special_gfx()
   img_star      = sprite_manager->load("star");
   img_1up       = sprite_manager->load("1up");
 
-  img_firebullet    = sprite_manager->load("firebullet");
-  img_icebullet    = sprite_manager->load("icebullet");
+  img_firebullet = sprite_manager->load("firebullet");
+  img_icebullet  = sprite_manager->load("icebullet");
 }
 
 void free_special_gfx()