Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4923/src
Modified Files:
title.cpp
Log Message:
Added Marek music to cvs and play it in the main menu.
Index: title.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- title.cpp 20 Apr 2004 11:43:43 -0000 1.52
+++ title.cpp 21 Apr 2004 17:43:26 -0000 1.53
@@ -248,6 +248,9 @@
update_time = st_get_ticks();
random_timer.start(rand() % 2000 + 2000);
+ Mix_Music* music = load_song(datadir + "/music/theme.mod");
+ play_music(music, 1);
+
Menu::set_current(main_menu);
while (Menu::current())
{
@@ -305,6 +308,7 @@
generate_contrib_menu();
break;
case 3:
+ halt_music();
leveleditor(1);
Menu::set_current(main_menu);
break;
@@ -354,11 +358,14 @@
frame++;
SDL_Delay(25);
+ if(!playing_music)
+ play_music(music, 1);
}
/* Free surfaces: */
delete bkg_title;
delete logo;
+ free_music(music);
}
#define MAX_VEL 10
|
