[Stratagus-CVS] stratagus/src clone/clone.c sound/sound_server.c

[Jimmy Salmon]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Jimmy Salmon <address@hidden>   03/10/31 15:39:40

Modified files:
        src/clone      : clone.c 
        src/sound      : sound_server.c 

Log message:
        Fixed title and menu music

Patches:
Index: stratagus/src/clone/clone.c
diff -u stratagus/src/clone/clone.c:1.217 stratagus/src/clone/clone.c:1.218
--- stratagus/src/clone/clone.c:1.217   Fri Oct 31 04:14:47 2003
+++ stratagus/src/clone/clone.c Fri Oct 31 15:39:38 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: clone.c,v 1.217 2003/10/31 09:14:47 pludov Exp $
+//     $Id: clone.c,v 1.218 2003/10/31 20:39:38 jsalmon3 Exp $
 
 //@{
 
@@ -1086,7 +1086,13 @@
            NetPlayers = 0;
 
            // Start new music for menus
+           if (PlayingMusic && strcmp(CurrentMusicFile, MenuMusic)) {
+               StopMusic();
+           }
            PlaySectionMusic(PlaySectionMainMenu);
+           if (!PlayingMusic && MenuMusic) {
+               PlayMusic(MenuMusic);
+           }
 
            EnableRedraw = RedrawMenu;
 
@@ -1274,6 +1280,9 @@
        for (i = 0; TitleScreen[i]; ++i) {
            if (PlayMovie(TitleScreen[i],
                    PlayMovieZoomScreen | PlayMovieKeepAspect)) {
+               if (!PlayingMusic && TitleMusic) {
+                   PlayMusic(TitleMusic);
+               }
                DisplayPicture(TitleScreen[i]);
                Invalidate();
                // FIXME: make the time configurable
Index: stratagus/src/sound/sound_server.c
diff -u stratagus/src/sound/sound_server.c:1.122 
stratagus/src/sound/sound_server.c:1.123
--- stratagus/src/sound/sound_server.c:1.122    Mon Oct  6 16:03:29 2003
+++ stratagus/src/sound/sound_server.c  Fri Oct 31 15:39:40 2003
@@ -27,7 +27,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: sound_server.c,v 1.122 2003/10/06 20:03:29 jsalmon3 Exp $
+//     $Id: sound_server.c,v 1.123 2003/10/31 20:39:40 jsalmon3 Exp $
 
 //@{
 
@@ -1181,10 +1181,6 @@
 #else
     DebugLevel0Fn("FIXME: must write non GLIB hash functions\n");
 #endif
-
-    if (TitleMusic) {
-       PlayMusic(TitleMusic);
-    }
 
     return 0;
 }