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

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

diff --git a/src/badguy/spiky.cpp b/src/badguy/spiky.cpp
index 0436883..e0e060b 100644 (file)
--- a/src/badguy/spiky.cpp
+++ b/src/badguy/spiky.cpp
@@ -1,79 +1,44 @@
-//  $Id$
-// 
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  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
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  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>
-
-#include "spiky.hpp"
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-static const float WALKSPEED = 80;
+#include "badguy/spiky.hpp"
 
-Spiky::Spiky(const lisp::Lisp& reader)
-{
-  reader.get("x", start_position.x);
-  reader.get("y", start_position.y);
-  bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("spiky");
-}
+#include "sprite/sprite.hpp"
+#include "supertux/object_factory.hpp"
 
-void
-Spiky::write(lisp::Writer& writer)
+Spiky::Spiky(const Reader& reader)
+  : WalkingBadguy(reader, "images/creatures/spiky/spiky.sprite", "left", "right")
 {
-  writer.start_list("spiky");
-
-  writer.write_float("x", start_position.x);
-  writer.write_float("y", start_position.y);
-
-  writer.end_list("spiky");
+  walk_speed = 80;
+  max_drop_height = 600;
 }
 
 void
-Spiky::activate()
+Spiky::freeze()
 {
-  physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
-  sprite->set_action(dir == LEFT ? "left" : "right");
+  WalkingBadguy::freeze();
+  sprite->set_action(dir == LEFT ? "iced-left" : "iced-right");
 }
 
-HitResponse
-Spiky::collision_solid(GameObject& , const CollisionHit& hit)
+bool
+Spiky::is_freezable() const
 {
-  if(fabsf(hit.normal.y) > .5) { // hit floor or roof?
-    physic.set_velocity_y(0);
-  } else { // hit right or left
-    dir = dir == LEFT ? RIGHT : LEFT;
-    sprite->set_action(dir == LEFT ? "left" : "right");
-    physic.set_velocity_x(-physic.get_velocity_x());
-  }
-
-  return CONTINUE;
+  return true;
 }
 
-HitResponse
-Spiky::collision_badguy(BadGuy& , const CollisionHit& hit)
-{
-  if(fabsf(hit.normal.x) > .8) { // left or right
-    dir = dir == LEFT ? RIGHT : LEFT;
-    sprite->set_action(dir == LEFT ? "left" : "right");
-    physic.set_velocity_x(-physic.get_velocity_x());
-  }
-
-  return CONTINUE;
-}
+IMPLEMENT_FACTORY(Spiky, "spiky");
 
-IMPLEMENT_FACTORY(Spiky, "spiky")
+/* EOF */