From 9bc1e444b1961c5399ab9ce06542c4de7c7a0ec5 Mon Sep 17 00:00:00 2001 From: Wolfgang Becker Date: Wed, 31 May 2006 17:07:55 +0000 Subject: [PATCH] Stop flame sound if flame gets deactivated. SVN-Revision: 3614 --- data/images/worldmap.strf | 2 +- data/levels/world2/level2.stl | 8 ++++---- src/badguy/flame.cpp | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/data/images/worldmap.strf b/data/images/worldmap.strf index b15b3d9e2..5416f763f 100644 --- 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 d9902eb51..6fbff20b0 100644 --- 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 390656f28..7fe05e9a2 100644 --- 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(); } -- 2.11.0