Changed jump behaviour: Tux will now jump even if the button was pressed (up to)...

[supertux.git] / src / object / bullet.cpp

diff --git a/src/object/bullet.cpp b/src/object/bullet.cpp
index 3a35faf..30e6dfa 100644 (file)
--- a/src/object/bullet.cpp
+++ b/src/object/bullet.cpp
@@ -44,6 +44,10 @@ Bullet::Bullet(const Vector& pos, float xm, int dir, BonusType type)
   } else if(type == ICE_BONUS) {
     life_count = 10;
     sprite.reset(sprite_manager->create("images/objects/bullets/icebullet.sprite"));
+  } else {
+    log_warning << "Bullet::Bullet called with unknown BonusType" << std::endl;
+    life_count = 10;
+    sprite.reset(sprite_manager->create("images/objects/bullets/firebullet.sprite"));
   }
 
   bbox.set_pos(pos);
@@ -95,6 +99,12 @@ Bullet::collision_solid(const CollisionHit& hit)
   }
 }
 
+void
+Bullet::ricochet(GameObject& , const CollisionHit& hit)
+{
+  collision_solid(hit);
+}
+
 HitResponse
 Bullet::collision(GameObject& , const CollisionHit& )
 {