X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fbouncing_snowball.cpp;h=67af264e3107092b3839c9349429eb63e52ca43f;hb=5f860f41a3f362de0a5dda951ff2ba4ebff95681;hp=5601bfb12cd791fd03934a7b024082ef14ff7348;hpb=36afad72b6c66d4619372892f589a4131afed638;p=supertux.git

diff --git a/src/badguy/bouncing_snowball.cpp b/src/badguy/bouncing_snowball.cpp
index 5601bfb12..67af264e3 100644
--- a/src/badguy/bouncing_snowball.cpp
+++ b/src/badguy/bouncing_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,85 +12,71 @@
 //  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.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <config.h>
+#include "badguy/bouncing_snowball.hpp"
 
-#include "bouncing_snowball.hpp"
+#include "sprite/sprite.hpp"
+#include "supertux/object_factory.hpp"
 
 static const float JUMPSPEED = -450;
-static const float WALKSPEED = 80;
+static const float BSNOWBALL_WALKSPEED = 80;
 
-BouncingSnowball::BouncingSnowball(const lisp::Lisp& reader)
-	: BadGuy(reader, "images/creatures/bouncing_snowball/bouncing_snowball.sprite")
+BouncingSnowball::BouncingSnowball(const Reader& reader)
+  : BadGuy(reader, "images/creatures/bouncing_snowball/bouncing_snowball.sprite")
 {
-  set_direction = false;
 }
 
 BouncingSnowball::BouncingSnowball(const Vector& pos, Direction d)
-	: BadGuy(pos, "images/creatures/bouncing_snowball/bouncing_snowball.sprite")
-{
-   set_direction = true;
-   initial_direction = d;
-}
-
-void
-BouncingSnowball::write(lisp::Writer& writer)
+  : BadGuy(pos, d, "images/creatures/bouncing_snowball/bouncing_snowball.sprite")
 {
-  writer.start_list("bouncingsnowball");
-
-  writer.write_float("x", start_position.x);
-  writer.write_float("y", start_position.y);
-
-  writer.end_list("bouncingsnowball");
 }
 
 void
-BouncingSnowball::activate()
+BouncingSnowball::initialize()
 {
-  if (set_direction) {dir = initial_direction;}
-  physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
+  physic.set_velocity_x(dir == LEFT ? -BSNOWBALL_WALKSPEED : BSNOWBALL_WALKSPEED);
   sprite->set_action(dir == LEFT ? "left" : "right");
 }
 
 bool
-BouncingSnowball::collision_squished(Player& player)
+BouncingSnowball::collision_squished(GameObject& object)
 {
   sprite->set_action("squished");
-  kill_squished(player);
+  kill_squished(object);
   return true;
 }
 
-HitResponse
-BouncingSnowball::collision_solid(GameObject& , const CollisionHit& hit)
+void
+BouncingSnowball::collision_solid(const CollisionHit& hit)
 {
-  if(hit.normal.y < -.5) { // hit floor
-    physic.set_velocity_y(JUMPSPEED);
-  } else if(hit.normal.y > .5) { // bumped on roof
+  if(sprite->get_action() == "squished")
+  {
+    return;
+  }
+
+  if(hit.bottom) {
+    if(get_state() == STATE_ACTIVE) {
+      physic.set_velocity_y(JUMPSPEED);
+    } else {
+      physic.set_velocity_y(0);
+    }
+  } else if(hit.top) {
     physic.set_velocity_y(0);
-  } else { // left or right collision
+  }
+
+  if(hit.left || hit.right) { // left or right collision
     dir = dir == LEFT ? RIGHT : LEFT;
     sprite->set_action(dir == LEFT ? "left" : "right");
     physic.set_velocity_x(-physic.get_velocity_x());
   }
-
-  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);
-  }
-
+  collision_solid(hit);
   return CONTINUE;
 }
 
-IMPLEMENT_FACTORY(BouncingSnowball, "bouncingsnowball")
-
+/* EOF */