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

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

diff --git a/src/badguy/angrystone.hpp b/src/badguy/angrystone.hpp
index 1a46e0c..6dbcef2 100644 (file)
--- a/src/badguy/angrystone.hpp
+++ b/src/badguy/angrystone.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  AngryStone - A spiked block that charges towards the player
 //  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,42 +12,38 @@
 //  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 __ANGRYSTONE_H__
-#define __ANGRYSTONE_H__
+#ifndef HEADER_SUPERTUX_BADGUY_ANGRYSTONE_HPP
+#define HEADER_SUPERTUX_BADGUY_ANGRYSTONE_HPP
 
-#include "badguy.hpp"
+#include "badguy/badguy.hpp"
 
 class AngryStone : public BadGuy
 {
 public:
-  AngryStone(const lisp::Lisp& reader);
+  AngryStone(const Reader& reader);
 
-  void write(lisp::Writer& writer);
   void collision_solid(const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
   void active_update(float elapsed_time);
   void kill_fall();
 
-  virtual AngryStone* clone() const { return new AngryStone(*this); }
-
 protected:
-  Vector attackDirection;  /**< 1-normalized vector of current attack direction */
-  Vector oldWallDirection; /**< if wall was hit during last attack: 1-normalized vector of last attack direction, (0,0) otherwise */
-
-  Timer timer;
-
   enum AngryStoneState {
     IDLE,
     CHARGING,
     ATTACKING,
     RECOVERING
   };
-  AngryStoneState state;
 
+private:
+  Vector attackDirection;  /**< 1-normalized vector of current attack direction */
+  Vector oldWallDirection; /**< if wall was hit during last attack: 1-normalized vector of last attack direction, (0,0) otherwise */
+  Timer timer;
+  AngryStoneState state;
 };
 
 #endif
+
+/* EOF */