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 (file)
index 0000000..1d47ca3
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 (file)
index d14ebbb..0000000
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 (file)
index 0000000..129b285
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 abacfa4..9c71009 100644 (file)
--- 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 afe93e4..7005674 100644 (file)
--- 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 fdae3ff..eb3ead6 100644 (file)
--- 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);