super-tux-commit

[Marek M. <wa...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1379/src

Modified Files:
	resources.cpp resources.h sector.cpp title.cpp title.h 
Log Message:
credits music plays on credits screen now


Index: resources.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/resources.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- resources.h	19 Dec 2004 13:34:11 -0000	1.20
+++ resources.h	13 Mar 2005 23:45:01 -0000	1.21
@@ -66,6 +66,7 @@
 
 extern MusicRef herring_song;
 extern MusicRef level_end_song;
+extern MusicRef credits_song;
 
 extern SpriteManager* sprite_manager;
 extern TileManager* tile_manager;

Index: title.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- title.cpp	6 Dec 2004 17:47:40 -0000	1.137
+++ title.cpp	13 Mar 2005 23:45:02 -0000	1.138
@@ -385,8 +385,10 @@
                   break;
                 case MNID_CREDITS:
                   fadeout(500);
+                   titlesession->get_current_sector()->play_music(CREDITS_MUSIC);
                   display_text_file("credits.txt", SCROLL_SPEED_CREDITS, white_big_text , white_text, white_small_text, blue_text );
                   fadeout(500);
+                  //titlesession->get_current_sector()->play_music(LEVEL_MUSIC); //not needed
                   Menu::set_current(main_menu);
                   break;
                 case MNID_QUITMAINMENU:

Index: resources.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- resources.cpp	20 Dec 2004 21:24:25 -0000	1.63
+++ resources.cpp	13 Mar 2005 23:45:00 -0000	1.64
@@ -43,6 +43,7 @@
 
 MusicRef herring_song;
 MusicRef level_end_song;
+MusicRef credits_song;
 
 SpriteManager* sprite_manager = 0;
 TileManager* tile_manager = 0;
@@ -163,6 +164,8 @@
                    ()->load_music(datadir + "/music/salcon.mod");
   level_end_song = SoundManager::get
                      ()->load_music(datadir + "/music/leveldone.mod");
+  credits_song = SoundManager::get
+                   ()->load_music(datadir + "/music/credits.ogg");
 }
 
 /* Free shared data: */

Index: sector.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/sector.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- sector.cpp	20 Dec 2004 21:24:25 -0000	1.62
+++ sector.cpp	13 Mar 2005 23:45:01 -0000	1.63
@@ -804,6 +804,9 @@
     case HERRING_MUSIC:
       SoundManager::get()->play_music(herring_song);
       break;
+    case CREDITS_MUSIC:
+      SoundManager::get()->play_music(credits_song);
+      break;
     default:
       SoundManager::get()->halt_music();
       break;

Index: title.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/title.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- title.h	20 Jul 2004 18:04:49 -0000	1.6
+++ title.h	13 Mar 2005 23:45:02 -0000	1.7
@@ -33,7 +33,7 @@
   
 /* Scrolling text speed */
 
-#define SCROLL_SPEED_CREDITS 2.0
+#define SCROLL_SPEED_CREDITS 1.5
 #define SCROLL_SPEED_MESSAGE 1.0
 
 void title(void);