2 more evil mainloops are gone

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

diff --git a/src/trigger/door.cpp b/src/trigger/door.cpp
index f493712..5956cb5 100644 (file)
--- a/src/trigger/door.cpp
+++ b/src/trigger/door.cpp
@@ -1,7 +1,7 @@
 //  $Id$
 //
-//  SuperTux -  A Jump'n Run
-//  Copyright (C) 2004 Matthias Braun <matze@braunis.de
+//  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
@@ -16,19 +16,18 @@
 //  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 "door.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 "lisp/lisp.h"
-#include "lisp/writer.h"
+#include <config.h>
 
-using namespace SuperTux;
+#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"
 
 Door::Door(const lisp::Lisp& reader)
 {
@@ -39,7 +38,7 @@ Door::Door(const lisp::Lisp& reader)
   reader.get("sector", target_sector);
   reader.get("spawnpoint", target_spawnpoint);
 
-  sprite = sprite_manager->create("door");
+  sprite = sprite_manager->create("images/objects/door/door.sprite");
 }
 
 Door::Door(int x, int y, std::string sector, std::string spawnpoint)
@@ -49,7 +48,7 @@ Door::Door(int x, int y, std::string sector, std::string spawnpoint)
   target_sector = sector;
   target_spawnpoint = spawnpoint;
 
-  sprite = sprite_manager->create("door");
+  sprite = sprite_manager->create("images/objects/door/door.sprite");
 }
 
 Door::~Door()
@@ -74,10 +73,11 @@ Door::write(lisp::Writer& writer)
 }
 
 void
-Door::action(float )
+Door::update(float )
 {
   //Check if door animation is complete
-  if(sprite->check_animation()) {
+  if(sprite->animation_done()) {
+    sprite->set_action("normal");
     GameSession::current()->respawn(target_sector, target_spawnpoint);
   }
 }
@@ -96,3 +96,4 @@ Door::event(Player& , EventType type)
   }
 }
 
+IMPLEMENT_FACTORY(Door, "door");