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

diff --git a/src/badguy/snowball.cpp b/src/badguy/snowball.cpp
index 65319d85d..2876357a4 100644
--- a/src/badguy/snowball.cpp
+++ b/src/badguy/snowball.cpp
@@ -1,7 +1,7 @@
 //  $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
@@ -12,64 +12,35 @@
 //  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.
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <config.h>
 
 #include "snowball.hpp"
 
-static const float WALKSPEED = 80;
-
 SnowBall::SnowBall(const lisp::Lisp& reader)
+    : WalkingBadguy(reader, "images/creatures/snowball/snowball.sprite", "left", "right")
 {
-  reader.get("x", start_position.x);
-  reader.get("y", start_position.y);
-  //This is for a hidden badguy :)
-  fluffy = false;  
-  reader.get("fluffy",fluffy);
-  bbox.set_size(31.8, 31.8);
-  if (fluffy) sprite = sprite_manager->create("fluffy");
-  else sprite = sprite_manager->create("snowball");
-  set_direction = false;
+  walk_speed = 80;
 }
 
-SnowBall::SnowBall(float pos_x, float pos_y, Direction d)
+SnowBall::SnowBall(const Vector& pos, Direction d)
+    : WalkingBadguy(pos, d, "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)
 {
   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);
-  }
-
+  WalkingBadguy::write(writer);
   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");
-}
-
 bool
 SnowBall::collision_squished(Player& player)
 {
@@ -78,30 +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;
-}
-
-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")