projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved door towards background
[supertux.git]
/
src
/
trigger
/
door.cpp
diff --git
a/src/trigger/door.cpp
b/src/trigger/door.cpp
index
29220d2
..
bd38c1b
100644
(file)
--- a/
src/trigger/door.cpp
+++ b/
src/trigger/door.cpp
@@
-110,7
+110,7
@@
Door::update(float )
void
Door::draw(DrawingContext& context)
{
void
Door::draw(DrawingContext& context)
{
- sprite->draw(context, bbox.p1, LAYER_
TILES
);
+ sprite->draw(context, bbox.p1, LAYER_
BACKGROUNDTILES+1
);
}
void
}
void
@@
-121,6
+121,7
@@
Door::event(Player& , EventType type)
// if door was activated, start opening it
if (type == EVENT_ACTIVATE) {
state = OPENING;
// if door was activated, start opening it
if (type == EVENT_ACTIVATE) {
state = OPENING;
+ sound_manager->play("sounds/door.wav");
sprite->set_action("opening", 1);
}
break;
sprite->set_action("opening", 1);
}
break;
@@
-142,7
+143,6
@@
Door::collision(GameObject& other, const CollisionHit& hit)
case OPENING:
break;
case OPEN:
case OPENING:
break;
case OPEN:
-sound_manager->play("sounds/door.wav");
{
// if door is open and was touched by a player, teleport the player
Player* player = dynamic_cast<Player*> (&other);
{
// if door is open and was touched by a player, teleport the player
Player* player = dynamic_cast<Player*> (&other);