X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fmrbomb.cpp;h=68e076892fc7b05cd3357fd627e466aae9a79a93;hb=7361e2120c8a5db222219e8b556c9efc8eda7bcc;hp=6a9ca03e905e1281547ba0aa3b7f7792a9a46c63;hpb=a705cb038b55f5d7634c646c134abaa7d16aee2b;p=supertux.git

diff --git a/src/badguy/mrbomb.cpp b/src/badguy/mrbomb.cpp
index 6a9ca03e9..68e076892 100644
--- a/src/badguy/mrbomb.cpp
+++ b/src/badguy/mrbomb.cpp
@@ -1,64 +1,78 @@
-#include <config.h>
+//  $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 "mrbomb.h"
-#include "bomb.h"
+#include <config.h>
 
-static const float WALKSPEED = 80;
+#include "mrbomb.hpp"
+#include "bomb.hpp"
+#include "sprite/sprite_manager.hpp"
 
-MrBomb::MrBomb(LispReader& reader)
+MrBomb::MrBomb(const lisp::Lisp& reader)
+	: WalkingBadguy(reader, "images/creatures/mr_bomb/mr_bomb.sprite", "left", "right")
 {
-  reader.read_float("x", start_position.x);
-  reader.read_float("y", start_position.y);
-  bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("mrbomb");
+  walk_speed = 80;
+  max_drop_height = 0;
+
+  //Check if we need another sprite
+  if( !reader.get( "sprite", sprite_name ) ){
+    return;
+  }
+  if( sprite_name == "" ){
+    sprite_name = "images/creatures/mr_bomb/mr_bomb.sprite";
+    return;
+  }
+  //Replace sprite
+  sprite = sprite_manager->create( sprite_name );
 }
 
-MrBomb::MrBomb(float pos_x, float pos_y)
+/* MrBomb created by a despencer always gets default sprite atm.*/
+MrBomb::MrBomb(const Vector& pos, Direction d)
+	: WalkingBadguy(pos, d, "images/creatures/mr_bomb/mr_bomb.sprite", "left", "right")
 {
-  start_position.x = pos_x;
-  start_position.y = pos_y;
-  bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("mrbomb");
+  walk_speed = 80;
+  max_drop_height = 0;
 }
 
 void
-MrBomb::write(LispWriter& writer)
+MrBomb::write(lisp::Writer& writer)
 {
   writer.start_list("mrbomb");
-
-  writer.write_float("x", get_pos().x);
-  writer.write_float("y", get_pos().y);
-
+  WalkingBadguy::write(writer);
   writer.end_list("mrbomb");
 }
 
-void
-MrBomb::activate()
-{
-  physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
-  sprite->set_action(dir == LEFT ? "left" : "right");
-}
-
 bool
 MrBomb::collision_squished(Player& player)
 {
   remove_me();
-  Sector::current()->add_object(new Bomb(get_pos(), dir));
-  player.bounce(*this);
+  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::kill_fall()
 {
-  if(fabsf(hit.normal.y) > .5) { // hit floor or roof?
-    physic.set_velocity_y(0);
-  } else { // hit right or left
-    dir = dir == LEFT ? RIGHT : LEFT;
-    sprite->set_action(dir == LEFT ? "left" : "right");
-    physic.set_velocity_x(-physic.get_velocity_x());
-  }
-
-  return CONTINUE;
+  remove_me();
+  Bomb* bomb = new Bomb(get_pos(), dir, sprite_name );
+  Sector::current()->add_object(bomb);
+  bomb->explode();
 }
 
+IMPLEMENT_FACTORY(MrBomb, "mrbomb")