From: Marek Moeckel <wansti@gmx.de>
Date: Fri, 9 May 2008 10:09:32 +0000 (+0000)
Subject: added new invincible sound and dedicated music based on the theme song
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=e1b3072eedd27350dd7c880931a946828e2cd778;p=supertux.git

added new invincible sound and dedicated music based on the theme song

SVN-Revision: 5447
---

diff --git a/data/music/invincible.ogg b/data/music/invincible.ogg
new file mode 100644
index 000000000..1d47ca3db
Binary files /dev/null and b/data/music/invincible.ogg differ
diff --git a/data/sounds/invincible.wav b/data/sounds/invincible.wav
deleted file mode 100644
index d14ebbb68..000000000
Binary files a/data/sounds/invincible.wav and /dev/null differ
diff --git a/data/sounds/invincible_start.ogg b/data/sounds/invincible_start.ogg
new file mode 100644
index 000000000..129b285c2
Binary files /dev/null and b/data/sounds/invincible_start.ogg differ
diff --git a/src/object/player.cpp b/src/object/player.cpp
index abacfa4d2..9c71009ff 100644
--- a/src/object/player.cpp
+++ b/src/object/player.cpp
@@ -1116,7 +1116,7 @@ Player::collision(GameObject& other, const CollisionHit& hit)
 void
 Player::make_invincible()
 {
-  sound_manager->play("sounds/invincible.wav");
+  sound_manager->play("sounds/invincible_start.ogg");
   invincible_timer.start(TUX_INVINCIBLE_TIME);
   Sector::current()->play_music(HERRING_MUSIC);
 }
diff --git a/src/object/player.hpp b/src/object/player.hpp
index afe93e48a..7005674e4 100644
--- a/src/object/player.hpp
+++ b/src/object/player.hpp
@@ -44,7 +44,7 @@ class Climbable;
 
 /* Times: */
 static const float TUX_SAFE_TIME = 1.8f;
-static const float TUX_INVINCIBLE_TIME = 10.0f;
+static const float TUX_INVINCIBLE_TIME = 14.0f;
 static const float TUX_INVINCIBLE_TIME_WARNING = 2.0f;
 static const float GROWING_TIME = 0.35f;
 static const int GROWING_FRAMES = 7;
diff --git a/src/sector.cpp b/src/sector.cpp
index fdae3ff23..eb3ead64e 100644
--- a/src/sector.cpp
+++ b/src/sector.cpp
@@ -1461,7 +1461,7 @@ Sector::play_music(MusicType type)
       sound_manager->play_music(music);
       break;
     case HERRING_MUSIC:
-      sound_manager->play_music("music/salcon.ogg");
+      sound_manager->play_music("music/invincible.ogg");
       break;
     case HERRING_WARNING_MUSIC:
       sound_manager->stop_music(TUX_INVINCIBLE_TIME_WARNING);