[Super-tux-commit] supertux/src gameloop.cpp,1.114,1.115 resources.cpp,1.28,1.29 resources.h,1.8,1.9

[Ingo R. <gr...@us...>]

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

Modified Files:
	gameloop.cpp resources.cpp resources.h 
Log Message:
- added level done song, endseq needs to be a bit longer to get the song right

Index: resources.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/resources.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- resources.h	24 Apr 2004 14:49:04 -0000	1.8
+++ resources.h	28 Apr 2004 17:27:15 -0000	1.9
@@ -36,6 +36,7 @@
 extern Surface* img_red_glow;
 
 extern MusicRef herring_song;
+extern MusicRef level_end_song;
 
 extern SpriteManager* sprite_manager;
 extern MusicManager* music_manager;

Index: gameloop.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- gameloop.cpp	27 Apr 2004 18:29:17 -0000	1.114
+++ gameloop.cpp	28 Apr 2004 17:27:14 -0000	1.115
@@ -428,6 +428,7 @@
       end_sequence = true;
       last_x_pos = -1;
       music_manager->halt_music();
+      music_manager->play_music(level_end_song);
       endsequence_timer.start(5000); // 5 seconds until we finish the map
     }
   else if (!end_sequence && tux->is_dead())

Index: resources.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- resources.cpp	28 Apr 2004 13:18:54 -0000	1.28
+++ resources.cpp	28 Apr 2004 17:27:15 -0000	1.29
@@ -37,6 +37,7 @@
 Surface* img_red_glow;
 
 MusicRef herring_song;
+MusicRef level_end_song;
 
 SpriteManager* sprite_manager = 0;
 MusicManager* music_manager = 0;
@@ -197,6 +198,7 @@
 
   /* Herring song */
   herring_song = music_manager->load_music(datadir + "/music/SALCON.MOD");
+  level_end_song = music_manager->load_music(datadir + "/music/tux-leveldone.mod");
 }