X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftrigger%2Fdoor.cpp;h=f8d2b72869b81ecf77af67756e3e1112535ceb63;hb=472d0ad804844d28811c86f03da74b6d6be53f1b;hp=29220d21c4a49c2b27666eef40feaae067acaac8;hpb=4b2fa8910e302074ac956fabc16348e2ff1b8fe2;p=supertux.git

diff --git a/src/trigger/door.cpp b/src/trigger/door.cpp
index 29220d21c..f8d2b7286 100644
--- a/src/trigger/door.cpp
+++ b/src/trigger/door.cpp
@@ -40,7 +40,7 @@ Door::Door(const lisp::Lisp& reader)
 
   sprite = sprite_manager->create("images/objects/door/door.sprite");
   sprite->set_action("closed");
-  bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());  
+  bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
 }
 
 Door::Door(int x, int y, std::string sector, std::string spawnpoint)
@@ -52,7 +52,7 @@ Door::Door(int x, int y, std::string sector, std::string spawnpoint)
 
   sprite = sprite_manager->create("images/objects/door/door.sprite");
   sprite->set_action("closed");
-  bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());  
+  bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
 }
 
 Door::~Door()
@@ -69,7 +69,7 @@ Door::write(lisp::Writer& writer)
   writer.write_float("y", bbox.p1.y);
   writer.write_float("width", bbox.get_width());
   writer.write_float("height", bbox.get_height());
-  
+
   writer.write_string("sector", target_sector);
   writer.write_string("spawnpoint", target_spawnpoint);
   sound_manager->preload("sounds/door.wav");
@@ -110,7 +110,7 @@ Door::update(float )
 void
 Door::draw(DrawingContext& context)
 {
-  sprite->draw(context, bbox.p1, LAYER_TILES);
+  sprite->draw(context, bbox.p1, LAYER_BACKGROUNDTILES+1);
 }
 
 void
@@ -121,6 +121,7 @@ Door::event(Player& , EventType type)
       // 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;
@@ -142,7 +143,6 @@ Door::collision(GameObject& other, const CollisionHit& hit)
     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);