X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fbullet.cpp;h=30e6dfaa0e0cc005ed0e85af97129a9d36c3a3b9;hb=555d1b7bebb45326d82d934e07463209837309b0;hp=e878660b061673f93132cf958d1641f100fd8774;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git

diff --git a/src/object/bullet.cpp b/src/object/bullet.cpp
index e878660b0..30e6dfaa0 100644
--- a/src/object/bullet.cpp
+++ b/src/object/bullet.cpp
@@ -28,44 +28,40 @@
 #include "badguy/badguy.hpp"
 #include "main.hpp"
 
-static const float BULLET_XM = 600;
-static const float BULLET_STARTING_YM = 0;
+namespace {
+  const float BULLET_XM = 600;
+  const float BULLET_STARTING_YM = 0;
+}
 
-Bullet::Bullet(const Vector& pos, float xm, int dir, int kind_)
-  : kind(kind_), life_count(3), sprite(0)
+Bullet::Bullet(const Vector& pos, float xm, int dir, BonusType type)
+  : life_count(3), type(type)
 {
-  bbox.set_pos(pos);
-  bbox.set_size(4, 4);
-
   float speed = dir == RIGHT ? BULLET_XM : -BULLET_XM;
   physic.set_velocity_x(speed + xm);
-  physic.set_velocity_y(-BULLET_STARTING_YM);
 
-  if (kind == ICE_BULLET) {
-    life_count = 6; //ice-bullets get "extra lives" for bumping off walls
-    sprite = sprite_manager->create("images/objects/bullets/icebullet.sprite");
-  } else if(kind == FIRE_BULLET) {
-    sprite = sprite_manager->create("images/objects/bullets/firebullet.sprite");
+  if(type == FIRE_BONUS) {
+    sprite.reset(sprite_manager->create("images/objects/bullets/firebullet.sprite"));
+  } 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);
+  bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
 }
 
 Bullet::~Bullet()
 {
-  delete sprite;
 }
 
 void
 Bullet::update(float elapsed_time)
 {
-  if(kind == FIRE_BULLET) {
-    // @not completely framerate independant :-/
-    physic.set_velocity_y(physic.get_velocity_y() - 50 * elapsed_time);
-  }
-  if(physic.get_velocity_y() > 900)
-    physic.set_velocity_y(900);
-  else if(physic.get_velocity_y() < -900)
-    physic.set_velocity_y(-900);
-
+  // remove bullet when it's offscreen
   float scroll_x =
     Sector::current()->camera->get_translation().x;
   float scroll_y =
@@ -88,31 +84,29 @@ Bullet::draw(DrawingContext& context)
   sprite->draw(context, get_pos(), LAYER_OBJECTS);
 }
 
-HitResponse
-Bullet::collision(GameObject& other, const CollisionHit& hit)
+void
+Bullet::collision_solid(const CollisionHit& hit)
 {
-  if(other.get_flags() & FLAG_SOLID) {
-    if(fabsf(hit.normal.y) > .5) { // roof or floor bump
-      physic.set_velocity_y(-physic.get_velocity_y());
-      life_count -= 1;
-    } else { // bumped left or right
-      if(kind == FIRE_BULLET)
-        remove_me();
-      else
-        physic.set_velocity_x(-physic.get_velocity_x());
-    }
-    
-    return CONTINUE;
-  }
-
-  BadGuy* badguy = dynamic_cast<BadGuy*> (&other);
-  if(badguy) {
-    badguy->kill_fall();
-    remove_me();
-    return FORCE_MOVE;
+  if(hit.top || hit.bottom) {
+    physic.set_velocity_y(-physic.get_velocity_y());
+    life_count--;
+  } else if(hit.left || hit.right) {
+    if(type == ICE_BONUS) {
+      physic.set_velocity_x(-physic.get_velocity_x());
+      life_count--;
+    } else
+      remove_me();
   }
- 
-  return FORCE_MOVE;
 }
 
+void
+Bullet::ricochet(GameObject& , const CollisionHit& hit)
+{
+  collision_solid(hit);
+}
 
+HitResponse
+Bullet::collision(GameObject& , const CollisionHit& )
+{
+  return FORCE_MOVE;
+}