From: Matthias Braun <matze@braunis.de>
Date: Mon, 29 Nov 2004 16:24:09 +0000 (+0000)
Subject: fix for star not changing music, thanks to Ondra Hosek for the patch
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=fa0babce2705e8f1406f7dbcb39de9cf86ae131e;p=supertux.git

fix for star not changing music, thanks to Ondra Hosek for the patch

SVN-Revision: 2228
---

diff --git a/TODO b/TODO
index a6bc743a9..49cd9f6fc 100644
--- a/TODO
+++ b/TODO
@@ -117,8 +117,6 @@ L: low priority
      - New forest tileset
      - Badguy sprites
      - Tux's buttjump animation
-[M] after picking up a star the salcon music isn't played anymore, but the
-    levelmusic restarts.
 
 [M] Save score on per-level basis to make high-score
 [M] Save time on per-level basis to make low-time-score
diff --git a/src/gameloop.cpp b/src/gameloop.cpp
index 84e4be276..c27bf6c19 100644
--- a/src/gameloop.cpp
+++ b/src/gameloop.cpp
@@ -770,7 +770,7 @@ GameSession::run()
       currentsector->player->kill(Player::KILL);
     
     /* Handle music: */
-    if(currentsector->player->invincible_timer.check() && !end_sequence)
+    if(currentsector->player->invincible_timer.started() && !end_sequence)
     {
       currentsector->play_music(HERRING_MUSIC);
     }