X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fmrbomb.cpp;h=d59b9582a585af059c7e8a0a82b60818b74d22d6;hb=a3316d68ca17966517c3f7bb0c0cb2b7e612fd0a;hp=5b63955992de8a062105de3f402d8c154c166281;hpb=e3bb6e46812f108f093e9ad0751a945c34b18cd3;p=supertux.git

diff --git a/src/badguy/mrbomb.cpp b/src/badguy/mrbomb.cpp
index 5b6395599..d59b9582a 100644
--- a/src/badguy/mrbomb.cpp
+++ b/src/badguy/mrbomb.cpp
@@ -1,27 +1,49 @@
+//  $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 "mrbomb.h"
-#include "bomb.h"
+#include "mrbomb.hpp"
+#include "bomb.hpp"
+#include "sprite/sprite_manager.hpp"
 
 static const float WALKSPEED = 80;
 
 MrBomb::MrBomb(const lisp::Lisp& reader)
+	: BadGuy(reader, "images/creatures/mr_cherry/mr_cherry.sprite")
 {
-  reader.get("x", start_position.x);
-  reader.get("y", start_position.y);
-  bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("mrbomb");
-  set_direction = false;
+  //Check if we need another sprite
+  if( !reader.get( "sprite", sprite_name ) ){
+    return;
+  }
+  if( sprite_name == "" ){
+    sprite_name = "images/creatures/mr_cherry/mr_cherry.sprite";
+    return;
+  }
+  //Replace sprite 
+  sprite = sprite_manager->create( sprite_name );
 }
 
-MrBomb::MrBomb(float pos_x, float pos_y, Direction d)
+/* MrBomb created by a despencer always gets default sprite atm.*/
+MrBomb::MrBomb(const Vector& pos, Direction d)
+	: BadGuy(pos, d, "images/creatures/mr_cherry/mr_cherry.sprite")
 {
-  start_position.x = pos_x;
-  start_position.y = pos_y;
-  bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("mrbomb");
-  set_direction = true;
-  initial_direction = d;
 }
 
 void
@@ -38,44 +60,64 @@ MrBomb::write(lisp::Writer& writer)
 void
 MrBomb::activate()
 {
-  if (set_direction) {dir = initial_direction;}
   physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
   sprite->set_action(dir == LEFT ? "left" : "right");
+  bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
+}
+
+void
+MrBomb::active_update(float elapsed_time)
+{
+  if (might_fall())
+  {
+    dir = (dir == LEFT ? RIGHT : LEFT);
+    sprite->set_action(dir == LEFT ? "left" : "right");
+    physic.set_velocity_x(-physic.get_velocity_x());
+  }
+
+  BadGuy::active_update(elapsed_time);
 }
 
 bool
 MrBomb::collision_squished(Player& player)
 {
   remove_me();
-  Sector::current()->add_object(new Bomb(get_pos(), dir));
+  Sector::current()->add_object(new Bomb(get_pos(), dir, sprite_name ));
   kill_squished(player);
   return true;
 }
 
-HitResponse
-MrBomb::collision_solid(GameObject& , const CollisionHit& hit)
+void
+MrBomb::collision_solid(const CollisionHit& hit)
 {
-  if(fabsf(hit.normal.y) > .5) { // hit floor or roof?
+  if(hit.bottom || hit.top) {
     physic.set_velocity_y(0);
-  } else { // hit right or left
+  }
+  if(hit.left || hit.right) {
     dir = dir == LEFT ? RIGHT : LEFT;
     sprite->set_action(dir == LEFT ? "left" : "right");
     physic.set_velocity_x(-physic.get_velocity_x());
   }
-
-  return CONTINUE;
 }
 
 HitResponse
-MrBomb::collision_badguy(BadGuy& , const CollisionHit& hit)
+MrBomb::collision_badguy(BadGuy&, const CollisionHit& hit )
 {
-  if(fabsf(hit.normal.x) > .8) { // left or right
-    dir = dir == LEFT ? RIGHT : LEFT;
-    sprite->set_action(dir == LEFT ? "left" : "right");    
-    physic.set_velocity_x(-physic.get_velocity_x());
+  if(hit.left || hit.right) {
+    dir = (dir == LEFT) ? RIGHT : LEFT;
+    sprite->set_action(dir == LEFT ? "left" : "right");
+    physic.set_velocity_x(-physic.get_velocity_x());               
   }
-
   return CONTINUE;
 }
 
+void
+MrBomb::kill_fall()
+{
+  remove_me();
+  Bomb* bomb = new Bomb(get_pos(), dir, sprite_name );
+  Sector::current()->add_object(bomb);
+  bomb->explode();
+}
+
 IMPLEMENT_FACTORY(MrBomb, "mrbomb")