super-tux-commit

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

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

Modified Files:
	resources.cpp resources.h sector.cpp title.cpp 
Log Message:
Made implementation of credits song less stupid, thanks to Matze's suggestions :-)


Index: resources.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/resources.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- resources.h	13 Mar 2005 23:45:01 -0000	1.21
+++ resources.h	14 Mar 2005 00:48:38 -0000	1.22
@@ -66,7 +66,6 @@
 
 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.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- title.cpp	13 Mar 2005 23:45:02 -0000	1.138
+++ title.cpp	14 Mar 2005 00:48:39 -0000	1.139
@@ -286,6 +286,7 @@
 {
   walking = true;
   LevelEditor* leveleditor;
+  MusicRef credits_music;
 
   Ticks::pause_init();
 
@@ -385,10 +386,10 @@
                   break;
                 case MNID_CREDITS:
                   fadeout(500);
-                   titlesession->get_current_sector()->play_music(CREDITS_MUSIC);
+                  credits_music = SoundManager::get()->load_music(datadir + "/music/credits.ogg");
+                  SoundManager::get()->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: sector.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/sector.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- sector.cpp	13 Mar 2005 23:45:01 -0000	1.63
+++ sector.cpp	14 Mar 2005 00:48:38 -0000	1.64
@@ -804,9 +804,6 @@
     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: resources.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- resources.cpp	13 Mar 2005 23:45:00 -0000	1.64
+++ resources.cpp	14 Mar 2005 00:48:38 -0000	1.65
@@ -164,8 +164,6 @@
                    ()->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: */