[Supertux-Commit] r5447 - in trunk/supertux: data/music data/sounds src src/object

wansti at millhouse.dreamhost.com wansti at millhouse.dreamhost.com
Fri May 9 03:09:32 PDT 2008


Author: wansti
Date: 2008-05-09 03:09:32 -0700 (Fri, 09 May 2008)
New Revision: 5447

Added:
   trunk/supertux/data/music/invincible.ogg
   trunk/supertux/data/sounds/invincible_start.ogg
Removed:
   trunk/supertux/data/sounds/invincible.wav
Modified:
   trunk/supertux/src/object/player.cpp
   trunk/supertux/src/object/player.hpp
   trunk/supertux/src/sector.cpp
Log:
added new invincible sound and dedicated music based on the theme song


Added: trunk/supertux/data/music/invincible.ogg
===================================================================
(Binary files differ)


Property changes on: trunk/supertux/data/music/invincible.ogg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/supertux/data/sounds/invincible.wav

Added: trunk/supertux/data/sounds/invincible_start.ogg
===================================================================
(Binary files differ)


Property changes on: trunk/supertux/data/sounds/invincible_start.ogg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/supertux/src/object/player.cpp
===================================================================
--- trunk/supertux/src/object/player.cpp	2008-05-09 01:48:47 UTC (rev 5446)
+++ trunk/supertux/src/object/player.cpp	2008-05-09 10:09:32 UTC (rev 5447)
@@ -1116,7 +1116,7 @@
 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);
 }

Modified: trunk/supertux/src/object/player.hpp
===================================================================
--- trunk/supertux/src/object/player.hpp	2008-05-09 01:48:47 UTC (rev 5446)
+++ trunk/supertux/src/object/player.hpp	2008-05-09 10:09:32 UTC (rev 5447)
@@ -44,7 +44,7 @@
 
 /* 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;

Modified: trunk/supertux/src/sector.cpp
===================================================================
--- trunk/supertux/src/sector.cpp	2008-05-09 01:48:47 UTC (rev 5446)
+++ trunk/supertux/src/sector.cpp	2008-05-09 10:09:32 UTC (rev 5447)
@@ -1461,7 +1461,7 @@
       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);




More information about the Supertux-Commit mailing list