projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
forgot more stuff
[supertux.git]
/
src
/
trigger
/
door.cpp
diff --git
a/src/trigger/door.cpp
b/src/trigger/door.cpp
index
f493712
..
efe8004
100644
(file)
--- a/
src/trigger/door.cpp
+++ b/
src/trigger/door.cpp
@@
-19,10
+19,11
@@
#include <config.h>
#include "door.h"
#include <config.h>
#include "door.h"
-#include "game
loop
.h"
+#include "game
_session
.h"
#include "resources.h"
#include "resources.h"
-#include "special/sprite.h"
-#include "special/sprite_manager.h"
+#include "object_factory.h"
+#include "sprite/sprite.h"
+#include "sprite/sprite_manager.h"
#include "video/drawing_context.h"
#include "app/globals.h"
#include "lisp/lisp.h"
#include "video/drawing_context.h"
#include "app/globals.h"
#include "lisp/lisp.h"
@@
-78,6
+79,7
@@
Door::action(float )
{
//Check if door animation is complete
if(sprite->check_animation()) {
{
//Check if door animation is complete
if(sprite->check_animation()) {
+ sprite->set_action("normal");
GameSession::current()->respawn(target_sector, target_spawnpoint);
}
}
GameSession::current()->respawn(target_sector, target_spawnpoint);
}
}
@@
-96,3
+98,4
@@
Door::event(Player& , EventType type)
}
}
}
}
+IMPLEMENT_FACTORY(Door, "door");