merged new collision detection branch back into mainline

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

diff --git a/src/object/bullet.hpp b/src/object/bullet.hpp
index 52becdd..3664f33 100644 (file)
--- a/src/object/bullet.hpp
+++ b/src/object/bullet.hpp
@@ -24,27 +24,21 @@
 #include "physic.hpp"
 #include "sprite/sprite.hpp"
 
-enum BulletsKind {
-  FIRE_BULLET,
-  ICE_BULLET
-};
-
 class Bullet : public MovingObject
 {
 public:
-  Bullet(const Vector& pos, float xm, int dir, int kind);
+  Bullet(const Vector& pos, float xm, int dir);
   ~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;        
-  
 private:
   int life_count;
   Physic physic;
-  Sprite* sprite;
+  std::auto_ptr<Sprite> sprite;
 };
 
 #endif