Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

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

diff --git a/src/badguy/bomb.hpp b/src/badguy/bomb.hpp
index 2481e97..e2f4e76 100644 (file)
--- 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,23 +12,21 @@
 //  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 "object/portable.hpp"
 #include "audio/sound_source.hpp"
+#include "badguy/badguy.hpp"
+#include "object/portable.hpp"
 
-class Bomb : public BadGuy, public Portable
+class Bomb : public BadGuy, 
+             public Portable
 {
 public:
   Bomb(const Vector& pos, Direction dir, std::string custom_sprite = "images/creatures/mr_bomb/bomb.sprite" );
-  Bomb(const Bomb& bomb);
 
-  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);
@@ -50,6 +46,12 @@ private:
   MovingObject* grabber;
 
   std::auto_ptr<SoundSource> ticking;
+
+private:
+  Bomb(const Bomb&);
+  Bomb& operator=(const Bomb&);
 };
 
 #endif
+
+/* EOF */