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

diff --git a/src/badguy/snowball.cpp b/src/badguy/snowball.cpp
index ce5ac61d4..1c2e6b678 100644
--- a/src/badguy/snowball.cpp
+++ b/src/badguy/snowball.cpp
@@ -1,24 +1,62 @@
+//  $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 <config.h>
 
-#include "snowball.h"
+#include "snowball.hpp"
 
 static const float WALKSPEED = 80;
 
-SnowBall::SnowBall(LispReader& reader)
+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);
+  bbox.set_size(31.8, 31.8);
+  if (fluffy) sprite = sprite_manager->create("images/creatures/fluffy/fluffy.sprite");
+  else sprite = sprite_manager->create("images/creatures/snowball/snowball.sprite");
+  set_direction = false;
+}
+
+SnowBall::SnowBall(float pos_x, float pos_y, Direction d)
 {
-  reader.read_float("x", start_position.x);
-  reader.read_float("y", start_position.y);
-  bbox.set_size(32, 32);
-  sprite = sprite_manager->create("snowball");
+  start_position.x = pos_x;
+  start_position.y = pos_y;
+  bbox.set_size(31.8, 31.8);
+  sprite = sprite_manager->create("images/creatures/snowball/snowball.sprite");
+  set_direction = true;
+  initial_direction = d;
 }
 
 void
-SnowBall::write(LispWriter& writer)
+SnowBall::write(lisp::Writer& writer)
 {
   writer.start_list("snowball");
 
-  writer.write_float("x", get_pos().x);
-  writer.write_float("y", get_pos().y);
+  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");
 }
@@ -26,6 +64,7 @@ SnowBall::write(LispWriter& writer)
 void
 SnowBall::activate()
 {
+  if (set_direction) {dir = initial_direction;}
   physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
   sprite->set_action(dir == LEFT ? "left" : "right");
 }
@@ -52,3 +91,16 @@ SnowBall::collision_solid(GameObject& , const CollisionHit& hit)
   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")