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

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

diff --git a/src/badguy/mole_rock.hpp b/src/badguy/mole_rock.hpp
index f5bb95b..4c6e02b 100644 (file)
--- a/src/badguy/mole_rock.hpp
+++ b/src/badguy/mole_rock.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  MoleRock - Rock thrown by "Mole" Badguy
 //  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.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,14 +12,12 @@
 //  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 __MOLE_ROCK_H__
-#define __MOLE_ROCK_H__
+#ifndef HEADER_SUPERTUX_BADGUY_MOLE_ROCK_HPP
+#define HEADER_SUPERTUX_BADGUY_MOLE_ROCK_HPP
 
-#include "badguy.hpp"
+#include "badguy/badguy.hpp"
 
 /**
  * Badguy "MoleRock" - Rock thrown by "Mole" Badguy
@@ -29,14 +25,12 @@
 class MoleRock : public BadGuy
 {
 public:
-  MoleRock(const lisp::Lisp& reader);
+  MoleRock(const Reader& reader);
   MoleRock(const Vector& pos, const Vector& velocity, const BadGuy* parent);
-  MoleRock(const MoleRock& mole_rock);
   ~MoleRock();
 
   void initialize();
   void deactivate();
-  void write(lisp::Writer& writer);
 
   void active_update(float elapsed_time);
 
@@ -44,13 +38,17 @@ public:
   HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
   HitResponse collision_player(Player& player, const CollisionHit& hit);
 
-  virtual MoleRock* clone() const { return new MoleRock(*this); }
-
   virtual bool updatePointers(const GameObject* from_object, GameObject* to_object);
 
 protected:
   const BadGuy* parent; /**< collisions with this BadGuy will be ignored */
   const Vector initial_velocity; /**< velocity at time of creation */
+
+private:
+  MoleRock(const MoleRock&);
+  MoleRock& operator=(const MoleRock&);
 };
 
 #endif
+
+/* EOF */