X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fmrbomb.cpp;h=8b411892c3b1339528f8d93c7ce803ed44811cd7;hb=dcd6b92996ea0767156f862be11498f1bd44e7c1;hp=76222d28fa27aaeae2b81b1bae0e6352641c4c70;hpb=ef57479f613b900b73eba8e8f4d026aae0de25cc;p=supertux.git

diff --git a/src/badguy/mrbomb.cpp b/src/badguy/mrbomb.cpp
index 76222d28f..8b411892c 100644
--- a/src/badguy/mrbomb.cpp
+++ b/src/badguy/mrbomb.cpp
@@ -1,68 +1,153 @@
-#include <config.h>
+//  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 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
+//  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, see <http://www.gnu.org/licenses/>.
 
-#include "mrbomb.h"
-#include "bomb.h"
+#include "audio/sound_manager.hpp"
+#include "badguy/bomb.hpp"
+#include "badguy/mrbomb.hpp"
+#include "object/explosion.hpp"
+#include "object/player.hpp"
+#include "sprite/sprite.hpp"
+#include "sprite/sprite_manager.hpp"
+#include "supertux/object_factory.hpp"
+#include "supertux/sector.hpp"
+#include "util/reader.hpp"
 
-static const float WALKSPEED = 80;
+MrBomb::MrBomb(const Reader& reader) :
+  WalkingBadguy(reader, "images/creatures/mr_bomb/mr_bomb.sprite", "left", "right"),
+  grabbed()
+{
+  walk_speed = 80;
+  max_drop_height = 16;
+  grabbed = false;
+
+  //Prevent stutter when Tux jumps on Mr Bomb
+  sound_manager->preload("sounds/explosion.wav");
+
+  //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 created by a dispenser always gets default sprite atm.*/
+MrBomb::MrBomb(const Vector& pos, Direction d) :
+  WalkingBadguy(pos, d, "images/creatures/mr_bomb/mr_bomb.sprite", "left", "right"),
+  grabbed()
+{
+  walk_speed = 80;
+  max_drop_height = 16;
+  grabbed = false;
+  sound_manager->preload("sounds/explosion.wav");
+}
+
+HitResponse
+MrBomb::collision(GameObject& object, const CollisionHit& hit)
+{
+  if(grabbed)
+    return FORCE_MOVE;
+  return WalkingBadguy::collision(object, hit);
+}
+
+HitResponse
+MrBomb::collision_player(Player& player, const CollisionHit& hit)
+{
+  if(grabbed)
+    return FORCE_MOVE;
+  return WalkingBadguy::collision_player(player, hit);
+}
 
-MrBomb::MrBomb(const lisp::Lisp& reader)
+bool
+MrBomb::collision_squished(GameObject& object)
 {
-  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;
+  Player* player = dynamic_cast<Player*>(&object);
+  if(player && player->is_invincible()) {
+    player->bounce(*this);
+    kill_fall();
+    return true;
+  }
+  if(is_valid()) {
+    remove_me();
+    Sector::current()->add_object(new Bomb(get_pos(), dir, sprite_name ));
+  }
+  kill_squished(object);
+  return true;
 }
 
-MrBomb::MrBomb(float pos_x, float pos_y, Direction d)
+void
+MrBomb::active_update(float elapsed_time)
 {
-  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;
+  if(grabbed)
+    return;
+  WalkingBadguy::active_update(elapsed_time);
 }
 
 void
-MrBomb::write(lisp::Writer& writer)
+MrBomb::kill_fall()
 {
-  writer.start_list("mrbomb");
+  if(is_valid()) {
+    remove_me();
+    Explosion* explosion = new Explosion(get_bbox().get_middle());
+    Sector::current()->add_object(explosion);
+  }
 
-  writer.write_float("x", get_pos().x);
-  writer.write_float("y", get_pos().y);
+  run_dead_script();
+}
 
-  writer.end_list("mrbomb");
+void
+MrBomb::grab(MovingObject&, const Vector& pos, Direction dir)
+{
+  assert(frozen);
+  movement = pos - get_pos();
+  this->dir = dir;
+  sprite->set_action(dir == LEFT ? "iced-left" : "iced-right");
+  set_colgroup_active(COLGROUP_DISABLED);
+  grabbed = true;
 }
 
 void
-MrBomb::activate()
+MrBomb::ungrab(MovingObject& , Direction dir)
 {
-  if (set_direction) {dir = initial_direction;}
-  physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
-  sprite->set_action(dir == LEFT ? "left" : "right");
+  this->dir = dir;
+  set_colgroup_active(COLGROUP_MOVING);
+  grabbed = false;
+}
+
+void
+MrBomb::freeze()
+{
+  WalkingBadguy::freeze();
+  sprite->set_action(dir == LEFT ? "iced-left" : "iced-right");
 }
 
 bool
-MrBomb::collision_squished(Player& player)
+MrBomb::is_freezable() const
 {
-  remove_me();
-  Sector::current()->add_object(new Bomb(get_pos(), dir));
-  player.bounce(*this);
   return true;
 }
 
-HitResponse
-MrBomb::collision_solid(GameObject& , const CollisionHit& hit)
+bool
+MrBomb::is_portable() const
 {
-  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;
+  return frozen;
 }
 
+/* EOF */