Stop flame sound if flame gets deactivated.

SVN-Revision: 3614

diff --git a/data/images/worldmap.strf b/data/images/worldmap.strf
index b15b3d9..5416f76 100644 (file)
--- a/data/images/worldmap.strf
+++ b/data/images/worldmap.strf
@@ -1536,7 +1536,7 @@
        (south #t)
        (east  #f)
        (west  #t)
-       (stop  #t))
+       (stop  #f))
 (tile
     (id 762)
     (images

diff --git a/data/levels/world2/level2.stl b/data/levels/world2/level2.stl
index d9902eb..6fbff20 100644 (file)
--- a/data/levels/world2/level2.stl
+++ b/data/levels/world2/level2.stl
@@ -198,13 +198,13 @@
                     (height 19.0)
                     (message (_ "Drink me")))
        
-        (powerup (x 3168) (y 416)
+        (powerup (x 3098) (y 416)
                  (sprite "images/objects/eat-me/eat-me.sprite")
                  (script "levelflip();")       
         )
       (bonusblock (x 672) (y 1056)
         (contents "custom")
-        (powerup
+        (powerup (x 672) (y 1056)
           (sprite "images/powerups/potions/red-potion.sprite")
           (script "levelflip();")
         )
@@ -218,8 +218,8 @@
         (script "levelflip();")
       )
       (powerup (x 8000) (y 352)
-        (sprite "images/objects/keys/key_gold.sprite")
-        (script "get_gold_key();")
+        (sprite "images/objects/keys/key_earth.sprite")
+        (script "add_key(\"earth\");")
         (disable-physics #t)
       )
       (infoblock (x 2560) (y 320)

diff --git a/src/badguy/flame.cpp b/src/badguy/flame.cpp
index 390656f..7fe05e9 100644 (file)
--- a/src/badguy/flame.cpp
+++ b/src/badguy/flame.cpp
@@ -75,6 +75,7 @@ Flame::activate()
 void
 Flame::deactivate()
 {
+  sound_source->stop();
   sound_source.release();
 }