X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fsnowball.cpp;h=2876357a4eb7adcdfc85583a3934efd8102380e1;hb=4a486d92343d1824b311c234e9321e08f280fe68;hp=ce5ac61d40853fc0aa6e64a00d2cf62931a9058b;hpb=6fe1f3519eecbbb75eca97c45a6697eee36b2442;p=supertux.git

diff --git a/src/badguy/snowball.cpp b/src/badguy/snowball.cpp
index ce5ac61d4..2876357a4 100644
--- a/src/badguy/snowball.cpp
+++ b/src/badguy/snowball.cpp
@@ -1,33 +1,44 @@
-#include <config.h>
+//  $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 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 "snowball.h"
+#include <config.h>
 
-static const float WALKSPEED = 80;
+#include "snowball.hpp"
 
-SnowBall::SnowBall(LispReader& reader)
+SnowBall::SnowBall(const lisp::Lisp& reader)
+    : WalkingBadguy(reader, "images/creatures/snowball/snowball.sprite", "left", "right")
 {
-  reader.read_float("x", start_position.x);
-  reader.read_float("y", start_position.y);
-  bbox.set_size(32, 32);
-  sprite = sprite_manager->create("snowball");
+  walk_speed = 80;
 }
 
-void
-SnowBall::write(LispWriter& writer)
+SnowBall::SnowBall(const Vector& pos, Direction d)
+    : WalkingBadguy(pos, d, "images/creatures/snowball/snowball.sprite", "left", "right")
 {
-  writer.start_list("snowball");
-
-  writer.write_float("x", get_pos().x);
-  writer.write_float("y", get_pos().y);
-
-  writer.end_list("snowball");
+  walk_speed = 80;
 }
 
 void
-SnowBall::activate()
+SnowBall::write(lisp::Writer& writer)
 {
-  physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
-  sprite->set_action(dir == LEFT ? "left" : "right");
+  writer.start_list("snowball");
+  WalkingBadguy::write(writer);
+  writer.end_list("snowball");
 }
 
 bool
@@ -38,17 +49,4 @@ SnowBall::collision_squished(Player& player)
   return true;
 }
 
-HitResponse
-SnowBall::collision_solid(GameObject& , const CollisionHit& hit)
-{
-  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;
-}
-
+IMPLEMENT_FACTORY(SnowBall, "snowball")