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

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

diff --git a/src/badguy/snowball.cpp b/src/badguy/snowball.cpp
index c562ab5..92769c7 100644 (file)
--- a/src/badguy/snowball.cpp
+++ b/src/badguy/snowball.cpp
@@ -1,12 +1,10 @@
-//  $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 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,93 +12,33 @@
 //  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 "snowball.hpp"
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-static const float WALKSPEED = 80;
+#include "badguy/snowball.hpp"
 
-SnowBall::SnowBall(const lisp::Lisp& reader)
-{
-  reader.get("x", start_position.x);
-  reader.get("y", start_position.y);
-  //This is for a hidden badguy :)
-  fluffy = false;  
-  reader.get("fluffy",fluffy);
-  if (fluffy) sprite = sprite_manager->create("images/creatures/fluffy/fluffy.sprite");
-  else sprite = sprite_manager->create("images/creatures/snowball/snowball.sprite");
-  bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
-  set_direction = false;
-}
+#include "sprite/sprite.hpp"
+#include "supertux/object_factory.hpp"
 
-SnowBall::SnowBall(float pos_x, float pos_y, Direction d)
+SnowBall::SnowBall(const Reader& reader)
+  : WalkingBadguy(reader, "images/creatures/snowball/snowball.sprite", "left", "right")
 {
-  start_position.x = pos_x;
-  start_position.y = pos_y;
-  sprite = sprite_manager->create("images/creatures/snowball/snowball.sprite");
-  bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
-  set_direction = true;
-  initial_direction = d;
-}
-
-void
-SnowBall::write(lisp::Writer& writer)
-{
-  writer.start_list("snowball");
-
-  writer.write_float("x", start_position.x);
-  writer.write_float("y", start_position.y);
-
-  if (fluffy) {  // don't give us away at every snowball
-    writer.write_bool("fluffy", true);
-  }
-
-  writer.end_list("snowball");
+  walk_speed = 80;
 }
 
-void
-SnowBall::activate()
+SnowBall::SnowBall(const Vector& pos, Direction d)
+  : WalkingBadguy(pos, d, "images/creatures/snowball/snowball.sprite", "left", "right")
 {
-  if (set_direction) {dir = initial_direction;}
-  physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
-  sprite->set_action(dir == LEFT ? "left" : "right");
+  walk_speed = 80;
 }
 
 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;
-}
+IMPLEMENT_FACTORY(SnowBall, "snowball");
 
-IMPLEMENT_FACTORY(SnowBall, "snowball")
+/* EOF */