more updates for playlist

src/game/intro.cpp

@@ -434,8 +434,7 @@ global void ShowIntro(const Intro *intro)
 
     CallbackMusicOff();
     StopMusic();
-    CurrentPlaySection = PlaySectionBriefing;
-    CDRomCheck(NULL);
+    PlaySectionMusic(PlaySectionBriefing);
     if( intro->VoiceFile[0] ) {
 	PlayFile(intro->VoiceFile[0]);
     }

src/sound/music.cpp

@@ -355,6 +355,7 @@ global int PlayCDRom(int name)
     }
 
     if (name == CDModeDefined) {
+	return 0;
         CDMode = CDModeDefined;
         track = cd_current_track();
         if (CurrentPlaySection == PlaySectionStats) {
@@ -470,7 +471,7 @@ global void PlaySectionMusic(PlaySectionType section)
 
     track = cd_current_track();
 
-    for (i = 0;; ++i) {
+    for (i = 0; i < NumPlaySections; ++i) {
 	if (PlaySections[i].Type == section && (!PlaySections[i].Race || 
 		!(strcmp(PlaySections[i].Race, ThisPlayer->RaceName)))) {
 	    break;

src/stratagus/mainloop.cpp

@@ -639,8 +639,7 @@ global void GameMainLoop(void)
 
     MultiPlayerReplayEachCycle();
 
-    CurrentPlaySection = PlaySectionGame;
-    CDRomCheck(NULL);
+    PlaySectionMusic(PlaySectionGame);
 
     while( GameRunning ) {
 #if defined(DEBUG) && defined(HIERARCHIC_PATHFINDER)
@@ -820,8 +819,7 @@ global void GameMainLoop(void)
     }
 
     if( GameResult==GameVictory || GameResult==GameDefeat ) {
-	CurrentPlaySection = PlaySectionStats;
-	CDRomCheck(NULL);
+	PlaySectionMusic(PlaySectionStats);
 	ShowStats();
     }
 

src/stratagus/stratagus.cpp

@@ -1077,8 +1077,8 @@ global void MenuLoop(char* filename, WorldMap* map)
 	    if( !PlayingMusic && strcmp(TitleMusic,MenuMusic) ) {
 		if (CDMode == CDModeOff) {
 		    PlayMusic(MenuMusic);
-		} else {
-		    CDRomCheck(NULL);
+		} else if (CDMode == CDModeDefined) {
+		    PlaySectionMusic(PlaySectionMainMenu);
 		}
 	    }
 	    EnableRedraw=RedrawMenu;