X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fbouncing_snowball.cpp;h=80d9bb660c4cd9977df02e01fe0cc50a3750ab96;hb=c3f9468882de1fd44f41ccfa7dae6d776bf306a7;hp=431cac254143dcf3ebed6b03f32aa0ebbc015d98;hpb=ef57479f613b900b73eba8e8f4d026aae0de25cc;p=supertux.git

diff --git a/src/badguy/bouncing_snowball.cpp b/src/badguy/bouncing_snowball.cpp
index 431cac254..80d9bb660 100644
--- a/src/badguy/bouncing_snowball.cpp
+++ b/src/badguy/bouncing_snowball.cpp
@@ -1,6 +1,25 @@
+//  $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"
+#include "bouncing_snowball.hpp"
 
 static const float JUMPSPEED = 450;
 static const float WALKSPEED = 80;
@@ -10,7 +29,7 @@ BouncingSnowball::BouncingSnowball(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("bouncingsnowball");
+  sprite = sprite_manager->create("images/creatures/bouncing_snowball/bouncing_snowball.sprite");
   set_direction = false;
 }
 
@@ -19,7 +38,7 @@ BouncingSnowball::BouncingSnowball(float pos_x, float pos_y, Direction d)
    start_position.x = pos_x;
    start_position.y = pos_y;
    bbox.set_size(31.8, 31.8);
-   sprite = sprite_manager->create("bouncingsnowball");
+   sprite = sprite_manager->create("images/creatures/bouncing_snowball/bouncing_snowball.sprite");
    set_direction = true;
    initial_direction = d;
 }
@@ -29,8 +48,8 @@ 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");
 }
@@ -67,3 +86,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")
+