X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fsnowball.cpp;h=3e286cceeacb1865197c6f563ac1fe614d52c17d;hb=9eab9403c2b9ff629c07380e8d5f1032d21bd3f7;hp=75f68b450a242c7acf5d1687097ea62c148a56f2;hpb=45d21c1c59a58aa557b62d3aa22ba89a975e323c;p=supertux.git

diff --git a/src/badguy/snowball.cpp b/src/badguy/snowball.cpp
index 75f68b450..3e286ccee 100644
--- a/src/badguy/snowball.cpp
+++ b/src/badguy/snowball.cpp
@@ -1,78 +1,43 @@
-#include <config.h>
-
-#include "snowball.h"
-
-static const float WALKSPEED = 80;
-
-SnowBall::SnowBall(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("snowball");
-  set_direction = false;
-}
-
-SnowBall::SnowBall(float pos_x, float pos_y, Direction d)
+//  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 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, see <http://www.gnu.org/licenses/>.
+
+#include "badguy/snowball.hpp"
+
+#include "sprite/sprite.hpp"
+#include "supertux/object_factory.hpp"
+
+SnowBall::SnowBall(const Reader& reader)
+  : WalkingBadguy(reader, "images/creatures/snowball/snowball.sprite", "left", "right")
 {
-  start_position.x = pos_x;
-  start_position.y = pos_y;
-  bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("snowball");
-  set_direction = true;
-  initial_direction = d;
+  walk_speed = 80;
 }
 
-void
-SnowBall::write(lisp::Writer& writer)
+SnowBall::SnowBall(const Vector& pos, Direction d, std::string script)
+  : WalkingBadguy(pos, d, "images/creatures/snowball/snowball.sprite", "left", "right")
 {
-  writer.start_list("snowball");
-
-  writer.write_float("x", start_position.x);
-  writer.write_float("y", start_position.y);
-
-  writer.end_list("snowball");
-}
-
-void
-SnowBall::activate()
-{
-  if (set_direction) {dir = initial_direction;}
-  physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
-  sprite->set_action(dir == LEFT ? "left" : "right");
+  walk_speed = 80;
+  dead_script = script;
 }
 
 bool
-SnowBall::collision_squished(Player& player)
+SnowBall::collision_squished(GameObject& object)
 {
   sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");
-  kill_squished(player);
+  kill_squished(object);
   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;
-}
-
-HitResponse
-SnowBall::collision_badguy(BadGuy& , const CollisionHit& hit)
-{
-  if(fabsf(hit.normal.x) > .8) { // left or right hit
-    dir = dir == LEFT ? RIGHT : LEFT;
-    sprite->set_action(dir == LEFT ? "left" : "right");
-    physic.set_velocity_x(-physic.get_velocity_x());       
-  }
-
-  return CONTINUE;
-}
-
+/* EOF */