fix cr/lfs and remove trailing whitespaces...

[supertux.git] / src / badguy / bomb.hpp

diff --git a/src/badguy/bomb.hpp b/src/badguy/bomb.hpp
index 0bbe1c4..430c270 100644 (file)
--- a/src/badguy/bomb.hpp
+++ b/src/badguy/bomb.hpp
@@ -25,31 +25,26 @@
 class Bomb : public BadGuy
 {
 public:
-  Bomb(const Vector& pos, Direction dir);
+  Bomb(const Vector& pos, Direction dir, std::string custom_sprite = "images/creatures/mr_cherry/cherry.sprite" );
   Bomb(const Bomb& bomb);
 
   void write(lisp::Writer& writer);
-  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
+  void collision_solid(const CollisionHit& hit);
   HitResponse collision_player(Player& player, const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
   void active_update(float elapsed_time);
   void kill_fall();
   void explode();
 
-  virtual Bomb* clone() const { return new Bomb(*this); }
-
 private:
   enum State {
     STATE_TICKING,
     STATE_EXPLODING
   };
-  
+
   State state;
-  Timer timer;
 
   std::auto_ptr<SoundSource> ticking;
-
 };
 
 #endif
-