Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

[supertux.git] / src / badguy / mrrocket.cpp

diff --git a/src/badguy/mrrocket.cpp b/src/badguy/mrrocket.cpp
index 0a77d7f..23ac5bc 100644 (file)
--- a/src/badguy/mrrocket.cpp
+++ b/src/badguy/mrrocket.cpp
@@ -1,63 +1,43 @@
-//  $Id$
-// 
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  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
 //  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.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <config.h>
+#include "badguy/mrrocket.hpp"
 
-#include "mrrocket.h"
+#include "object/explosion.hpp"
+#include "sprite/sprite.hpp"
+#include "supertux/object_factory.hpp"
+#include "supertux/sector.hpp"
 
 static const float SPEED = 200;
 
-MrRocket::MrRocket(const lisp::Lisp& reader)
+MrRocket::MrRocket(const Reader& reader) :
+  BadGuy(reader, "images/creatures/mr_rocket/mr_rocket.sprite"),
+  collision_timer()
 {
-  reader.get("x", start_position.x);
-  reader.get("y", start_position.y);
-  bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("mrrocket");
-  set_direction = false;
 }
 
-MrRocket::MrRocket(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("mrrocket");
-  set_direction = true;
-  initial_direction = d;
-}
-
-void
-MrRocket::write(lisp::Writer& writer)
+MrRocket::MrRocket(const Vector& pos, Direction d) :
+  BadGuy(pos, d, "images/creatures/mr_rocket/mr_rocket.sprite"),
+  collision_timer()
 {
-  writer.start_list("mrrocket");
-
-  writer.write_float("x", start_position.x);
-  writer.write_float("y", start_position.y);
-
-  writer.end_list("mrrocket");
 }
 
 void
-MrRocket::activate()
+MrRocket::initialize()
 {
-  if (set_direction) {dir = initial_direction;}
   physic.set_velocity_x(dir == LEFT ? -SPEED : SPEED);
   physic.enable_gravity(false);
   sprite->set_action(dir == LEFT ? "left" : "right");
@@ -67,36 +47,36 @@ void
 MrRocket::active_update(float elapsed_time)
 {
   if (collision_timer.check()) {
-    Sector::current()->add_object(new RocketExplosion(get_pos(), dir));
+    Sector::current()->add_object(new Explosion(get_bbox().get_middle()));
     remove_me();
   }
   else if (!collision_timer.started()) {
-     movement=physic.get_movement(elapsed_time);
-     sprite->set_action(dir == LEFT ? "left" : "right");
+    movement=physic.get_movement(elapsed_time);
+    sprite->set_action(dir == LEFT ? "left" : "right");
   }
 }
 
 bool
-MrRocket::collision_squished(Player& player)
+MrRocket::collision_squished(GameObject& object)
 {
   sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");
-  kill_squished(player);
+  kill_squished(object);
   kill_fall();
   return true;
 }
 
-HitResponse
-MrRocket::collision_solid(GameObject& , const CollisionHit& hit)
+void
+MrRocket::collision_solid(const CollisionHit& hit)
 {
-  if(fabsf(hit.normal.y) > .5) { // hit floor or roof?
+  if(hit.top || hit.bottom) {
     physic.set_velocity_y(0);
-  } else { // hit right or left
+  } else if(hit.left || hit.right) {
     sprite->set_action(dir == LEFT ? "collision-left" : "collision-right");
     physic.set_velocity_x(0);
-    collision_timer.start(0.2, true);
+    collision_timer.start(0.2f, true);
   }
-
-  return CONTINUE;
 }
 
-IMPLEMENT_FACTORY(MrRocket, "mrrocket")
+IMPLEMENT_FACTORY(MrRocket, "mrrocket");
+
+/* EOF */