X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fspecial.cpp;h=3495017c17dbd0d5e1cff48754dea2e23830f3a2;hb=828b5e1ef1cb89d830735f24dd79bbd9b09d5b32;hp=1ff38f04018b045272fd3b8ec45e27f383c4dfea;hpb=aea1b715f22599f5e202693cb93a0852704d6422;p=supertux.git

diff --git a/src/special.cpp b/src/special.cpp
index 1ff38f040..3495017c1 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)
     {
@@ -63,7 +66,7 @@ Bullet::Bullet(const Vector& pos, float xm, int dir, int kind_)
       physic.set_velocity_x(-BULLET_XM + xm);
     }
 
-  base.y = pos.y + base.height/2;
+  base.y = pos.y;
   physic.set_velocity_y(-BULLET_STARTING_YM);
   old_base = base;
   kind = kind_;
@@ -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