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 eb74a62..430c270 100644 (file)
--- a/src/badguy/bomb.hpp
+++ b/src/badguy/bomb.hpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -12,11 +12,10 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-//  02111-1307, USA.
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #ifndef __BOMB_H__
 #define __BOMB_H__
@@ -26,10 +25,11 @@
 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);
@@ -41,10 +41,10 @@ private:
     STATE_TICKING,
     STATE_EXPLODING
   };
-  
+
   State state;
-  Timer timer;
+
+  std::auto_ptr<SoundSource> ticking;
 };
 
 #endif
-