X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fbouncing_snowball.cpp;h=e998f6803ca8da2c9fe31333ca3f32fc7e615f66;hb=864c93e01ec366f730b3ebad08d5c52d6a9363b6;hp=4f9334d7b8b662a9c154eb0e11840d7e2ac97c37;hpb=3f1a54cc4a2b8deb8ebb31061a00ffcec5fb3169;p=supertux.git

diff --git a/src/badguy/bouncing_snowball.cpp b/src/badguy/bouncing_snowball.cpp
index 4f9334d7b..e998f6803 100644
--- a/src/badguy/bouncing_snowball.cpp
+++ b/src/badguy/bouncing_snowball.cpp
@@ -1,3 +1,23 @@
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2005 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 "bouncing_snowball.h"
@@ -5,29 +25,32 @@
 static const float JUMPSPEED = 450;
 static const float WALKSPEED = 80;
 
-BouncingSnowball::BouncingSnowball(LispReader& reader)
+BouncingSnowball::BouncingSnowball(const lisp::Lisp& reader)
 {
-  reader.read_float("x", start_position.x);
-  reader.read_float("y", start_position.y);
-  bbox.set_size(32, 32);
+  reader.get("x", start_position.x);
+  reader.get("y", start_position.y);
+  bbox.set_size(31.8, 31.8);
   sprite = sprite_manager->create("bouncingsnowball");
+  set_direction = false;
 }
 
-BouncingSnowball::BouncingSnowball(float pos_x, float pos_y)
+BouncingSnowball::BouncingSnowball(float pos_x, float pos_y, Direction d)
 {
    start_position.x = pos_x;
    start_position.y = pos_y;
-   bbox.set_size(32, 32);
+   bbox.set_size(31.8, 31.8);
    sprite = sprite_manager->create("bouncingsnowball");
+   set_direction = true;
+   initial_direction = d;
 }
 
 void
-BouncingSnowball::write(LispWriter& writer)
+BouncingSnowball::write(lisp::Writer& writer)
 {
   writer.start_list("bouncingsnowball");
 
-  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);
 
   writer.end_list("bouncingsnowball");
 }
@@ -35,6 +58,7 @@ BouncingSnowball::write(LispWriter& writer)
 void
 BouncingSnowball::activate()
 {
+  if (set_direction) {dir = initial_direction;}
   physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
   sprite->set_action(dir == LEFT ? "left" : "right");
 }
@@ -63,3 +87,19 @@ BouncingSnowball::collision_solid(GameObject& , const CollisionHit& hit)
   return CONTINUE;
 }
 
+HitResponse
+BouncingSnowball::collision_badguy(BadGuy& , const CollisionHit& hit)
+{
+  if(fabsf(hit.normal.x) > .8) { // left/right?
+    dir = dir == LEFT ? RIGHT : LEFT;
+    sprite->set_action(dir == LEFT ? "left" : "right");    
+    physic.set_velocity_x(-physic.get_velocity_x());
+  } else if(hit.normal.y < -.8) { // grounf
+    physic.set_velocity_y(JUMPSPEED);
+  }
+
+  return CONTINUE;
+}
+
+IMPLEMENT_FACTORY(BouncingSnowball, "bouncingsnowball")
+