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

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

diff --git a/src/badguy/angrystone.cpp b/src/badguy/angrystone.cpp
index cd74332..4875f76 100644 (file)
--- a/src/badguy/angrystone.cpp
+++ b/src/badguy/angrystone.cpp
@@ -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,18 +12,13 @@
 //  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.
-
-#include <config.h>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "angrystone.hpp"
+#include "badguy/angrystone.hpp"
 
-#include "lisp/writer.hpp"
 #include "object/player.hpp"
-#include "object_factory.hpp"
 #include "sprite/sprite.hpp"
+#include "supertux/object_factory.hpp"
 
 static const float SPEED = 240;
 
@@ -33,8 +26,12 @@ static const float CHARGE_TIME = .5;
 static const float ATTACK_TIME = 1;
 static const float RECOVER_TIME = .5;
 
-AngryStone::AngryStone(const lisp::Lisp& reader)
-        : BadGuy(reader, "images/creatures/angrystone/angrystone.sprite"), state(IDLE)
+AngryStone::AngryStone(const Reader& reader) :
+  BadGuy(reader, "images/creatures/angrystone/angrystone.sprite"), 
+  attackDirection(),
+  oldWallDirection(),
+  timer(),
+  state(IDLE)
 {
   physic.set_velocity_x(0);
   physic.set_velocity_y(0);
@@ -43,17 +40,6 @@ AngryStone::AngryStone(const lisp::Lisp& reader)
 }
 
 void
-AngryStone::write(lisp::Writer& writer)
-{
-  writer.start_list("angrystone");
-
-  writer.write("x", start_position.x);
-  writer.write("y", start_position.y);
-
-  writer.end_list("angrystone");
-}
-
-void
 AngryStone::collision_solid(const CollisionHit& hit)
 {
   // TODO
@@ -122,20 +108,20 @@ AngryStone::active_update(float elapsed_time) {
           state = CHARGING;
         }
       } else
-      if ((dy > -playerHeight) && (dy < badguyHeight)) {
-        if (dx > 0) {
-          attackDirection.x = 1;
-          attackDirection.y = 0;
-        } else {
-          attackDirection.x = -1;
-          attackDirection.y = 0;
+        if ((dy > -playerHeight) && (dy < badguyHeight)) {
+          if (dx > 0) {
+            attackDirection.x = 1;
+            attackDirection.y = 0;
+          } else {
+            attackDirection.x = -1;
+            attackDirection.y = 0;
+          }
+          if ((attackDirection.x != oldWallDirection.x) || (attackDirection.y != oldWallDirection.y)) {
+            sprite->set_action("charging");
+            timer.start(CHARGE_TIME);
+            state = CHARGING;
+          }
         }
-        if ((attackDirection.x != oldWallDirection.x) || (attackDirection.y != oldWallDirection.y)) {
-          sprite->set_action("charging");
-          timer.start(CHARGE_TIME);
-          state = CHARGING;
-        }
-      }
 
     }
   }
@@ -176,4 +162,6 @@ AngryStone::active_update(float elapsed_time) {
 
 }
 
-IMPLEMENT_FACTORY(AngryStone, "angrystone")
+IMPLEMENT_FACTORY(AngryStone, "angrystone");
+
+/* EOF */