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 58f4df1..23ac5bc 100644 (file)
--- a/src/badguy/mrrocket.cpp
+++ b/src/badguy/mrrocket.cpp
@@ -1,12 +1,10 @@
-//  $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 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
@@ -14,43 +12,30 @@
 //  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>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "mrrocket.hpp"
+#include "badguy/mrrocket.hpp"
 
 #include "object/explosion.hpp"
-#include "lisp/writer.hpp"
-#include "object_factory.hpp"
-#include "sector.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)
-        : BadGuy(reader, "images/creatures/mr_rocket/mr_rocket.sprite")
+MrRocket::MrRocket(const Reader& reader) :
+  BadGuy(reader, "images/creatures/mr_rocket/mr_rocket.sprite"),
+  collision_timer()
 {
 }
 
-MrRocket::MrRocket(const Vector& pos, Direction d)
-        : BadGuy(pos, d, "images/creatures/mr_rocket/mr_rocket.sprite")
+MrRocket::MrRocket(const Vector& pos, Direction d) :
+  BadGuy(pos, d, "images/creatures/mr_rocket/mr_rocket.sprite"),
+  collision_timer()
 {
 }
 
 void
-MrRocket::write(lisp::Writer& writer)
-{
-  writer.start_list("mrrocket");
-
-  writer.write("x", start_position.x);
-  writer.write("y", start_position.y);
-
-  writer.end_list("mrrocket");
-}
-
-void
 MrRocket::initialize()
 {
   physic.set_velocity_x(dir == LEFT ? -SPEED : SPEED);
@@ -66,8 +51,8 @@ MrRocket::active_update(float elapsed_time)
     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");
   }
 }
 
@@ -92,4 +77,6 @@ MrRocket::collision_solid(const CollisionHit& hit)
   }
 }
 
-IMPLEMENT_FACTORY(MrRocket, "mrrocket")
+IMPLEMENT_FACTORY(MrRocket, "mrrocket");
+
+/* EOF */