small fix

[supertux.git] / src / trigger / door.cpp

diff --git a/src/trigger/door.cpp b/src/trigger/door.cpp
index 1d576ae..caaaf0a 100644 (file)
--- a/src/trigger/door.cpp
+++ b/src/trigger/door.cpp
@@ -18,34 +18,34 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <config.h>
 
-#include "door.h"
-#include "utils/lispreader.h"
-#include "utils/lispwriter.h"
-#include "gameloop.h"
-#include "resources.h"
-#include "special/sprite.h"
-#include "special/sprite_manager.h"
-#include "video/drawing_context.h"
-#include "app/globals.h"
+#include "door.hpp"
+#include "game_session.hpp"
+#include "resources.hpp"
+#include "object_factory.hpp"
+#include "sprite/sprite.hpp"
+#include "sprite/sprite_manager.hpp"
+#include "video/drawing_context.hpp"
+#include "lisp/lisp.hpp"
+#include "lisp/writer.hpp"
 
-using namespace SuperTux;
-
-Door::Door(LispReader& reader)
+Door::Door(const lisp::Lisp& reader)
 {
-  reader.read_float("x", bbox.p1.x);
-  reader.read_float("y", bbox.p1.y);
+  reader.get("x", bbox.p1.x);
+  reader.get("y", bbox.p1.y);
   bbox.set_size(32, 64);
 
-  reader.read_string("sector", target_sector);
-  reader.read_string("spawnpoint", target_spawnpoint);
+  reader.get("sector", target_sector);
+  reader.get("spawnpoint", target_spawnpoint);
 
   sprite = sprite_manager->create("door");
 }
 
-Door::Door(int x, int y)
+Door::Door(int x, int y, std::string sector, std::string spawnpoint)
 {
   bbox.set_pos(Vector(x, y));
   bbox.set_size(32, 64);
+  target_sector = sector;
+  target_spawnpoint = spawnpoint;
 
   sprite = sprite_manager->create("door");
 }
@@ -56,7 +56,7 @@ Door::~Door()
 }
 
 void
-Door::write(LispWriter& writer)
+Door::write(lisp::Writer& writer)
 {
   writer.start_list("door");
 
@@ -72,10 +72,11 @@ Door::write(LispWriter& writer)
 }
 
 void
-Door::action(float )
+Door::update(float )
 {
   //Check if door animation is complete
-  if (!sprite->check_animation()) {
+  if(sprite->check_animation()) {
+    sprite->set_action("normal");
     GameSession::current()->respawn(target_sector, target_spawnpoint);
   }
 }
@@ -94,3 +95,4 @@ Door::event(Player& , EventType type)
   }
 }
 
+IMPLEMENT_FACTORY(Door, "door");