[ Patch #1793 ] Turn physic into POD

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

diff --git a/src/badguy/mrrocket.cpp b/src/badguy/mrrocket.cpp
index 6414484..7e90629 100644 (file)
--- a/src/badguy/mrrocket.cpp
+++ b/src/badguy/mrrocket.cpp
@@ -1,26 +1,36 @@
+//  $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 "mrrocket.h"
+#include "mrrocket.hpp"
 
 static const float SPEED = 200;
 
 MrRocket::MrRocket(const lisp::Lisp& reader)
+       : BadGuy(reader, "images/creatures/mr_rocket/mr_rocket.sprite")
 {
-  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)
+MrRocket::MrRocket(const Vector& pos, Direction d)
+       : BadGuy(pos, d, "images/creatures/mr_rocket/mr_rocket.sprite")
 {
-  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
@@ -37,14 +47,13 @@ MrRocket::write(lisp::Writer& writer)
 void
 MrRocket::activate()
 {
-  if (set_direction) {dir = initial_direction;}
-  physic.set_velocity_x(dir == LEFT ? -SPEED : SPEED);
-  physic.enable_gravity(false);
+  physic.vx = (dir == LEFT ? -SPEED : SPEED);
+  physic.gravity_enabled = false;
   sprite->set_action(dir == LEFT ? "left" : "right");
 }
 
 void
-MrRocket::active_action(float elapsed_time)
+MrRocket::active_update(float elapsed_time)
 {
   if (collision_timer.check()) {
     Sector::current()->add_object(new RocketExplosion(get_pos(), dir));
@@ -57,26 +66,24 @@ MrRocket::active_action(float elapsed_time)
 }
 
 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?
-    physic.set_velocity_y(0);
-  } else { // hit right or left
+  if(hit.top || hit.bottom) {
+    physic.vy = 0;
+  } else if(hit.left || hit.right) {
     sprite->set_action(dir == LEFT ? "collision-left" : "collision-right");
-    physic.set_velocity_x(0);
+    physic.vx = 0;
     collision_timer.start(0.2, true);
   }
-
-  return CONTINUE;
 }
 
 IMPLEMENT_FACTORY(MrRocket, "mrrocket")