X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fbomb.hpp;h=a45dd2298af07d3ed5587a168225aab1fa33cc18;hb=477ff26b2f06ee1743996a0feba8ebe0e6c28ba4;hp=430c270d0eb6d5351ca8986c407a9944299715b5;hpb=a113d3bd1feddd510e3b2852b0d42522735eee40;p=supertux.git

diff --git a/src/badguy/bomb.hpp b/src/badguy/bomb.hpp
index 430c270d0..a45dd2298 100644
--- a/src/badguy/bomb.hpp
+++ b/src/badguy/bomb.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  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
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,37 +12,46 @@
 //  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.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef __BOMB_H__
-#define __BOMB_H__
+#ifndef HEADER_SUPERTUX_BADGUY_BOMB_HPP
+#define HEADER_SUPERTUX_BADGUY_BOMB_HPP
 
-#include "badguy.hpp"
+#include "audio/sound_source.hpp"
+#include "badguy/badguy.hpp"
+#include "object/portable.hpp"
 
-class Bomb : public BadGuy
+class Bomb : public BadGuy, 
+             public Portable
 {
 public:
-  Bomb(const Vector& pos, Direction dir, std::string custom_sprite = "images/creatures/mr_cherry/cherry.sprite" );
-  Bomb(const Bomb& bomb);
+  Bomb(const Vector& pos, Direction dir, std::string custom_sprite = "images/creatures/mr_bomb/bomb.sprite" );
 
-  void write(lisp::Writer& writer);
   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();
+  void grab(MovingObject& object, const Vector& pos, Direction dir);
+  void ungrab(MovingObject& object, Direction dir);
 
 private:
   enum State {
-    STATE_TICKING,
-    STATE_EXPLODING
+    STATE_TICKING
   };
 
   State state;
+  bool grabbed;
+  MovingObject* grabber;
+
+  std::unique_ptr<SoundSource> ticking;
 
-  std::auto_ptr<SoundSource> ticking;
+private:
+  Bomb(const Bomb&);
+  Bomb& operator=(const Bomb&);
 };
 
 #endif
+
+/* EOF */