X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fbullet.cpp;h=30e6dfaa0e0cc005ed0e85af97129a9d36c3a3b9;hb=555d1b7bebb45326d82d934e07463209837309b0;hp=3a35faf6e8fa70cd3605db786dfbd3f3db557bed;hpb=89ecbfcacb9abac599f8feba52792392b8199cf1;p=supertux.git diff --git a/src/object/bullet.cpp b/src/object/bullet.cpp index 3a35faf6e..30e6dfaa0 100644 --- 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& ) {