X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fbullet.hpp;h=c3464d7d5344330786491a65d5fe1f933199f799;hb=ca967dcf4ee89f99880355be00782d1cd047be6a;hp=52becdda45fc66d0d52e8cca86010f6c17700a81;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git

diff --git a/src/object/bullet.hpp b/src/object/bullet.hpp
index 52becdda4..c3464d7d5 100644
--- a/src/object/bullet.hpp
+++ b/src/object/bullet.hpp
@@ -23,28 +23,35 @@
 #include "moving_object.hpp"
 #include "physic.hpp"
 #include "sprite/sprite.hpp"
+#include "player_status.hpp"
 
-enum BulletsKind {
-  FIRE_BULLET,
-  ICE_BULLET
-};
-
-class Bullet : public MovingObject
+class Bullet : public MovingObject, private UsesPhysic
 {
 public:
-  Bullet(const Vector& pos, float xm, int dir, int kind);
+  Bullet(const Vector& pos, float xm, int dir, BonusType type);
   ~Bullet();
-  
+
   void update(float elapsed_time);
   void draw(DrawingContext& context);
+  void collision_solid(const CollisionHit& hit);
   HitResponse collision(GameObject& other, const CollisionHit& hit);
 
-  int kind;        
-  
+  /**
+   * Makes bullet bounce off an object (that got hit).
+   * To be called by the collision handler of that object.
+   * Note that the @c hit parameter is filled in as perceived by the object, not by the bullet.
+   */
+  void ricochet(GameObject& other, const CollisionHit& hit);
+
+  BonusType get_type()
+  {
+    return type;
+  }
+
 private:
   int life_count;
-  Physic physic;
-  Sprite* sprite;
+  std::auto_ptr<Sprite> sprite;
+  BonusType type;
 };
 
 #endif