use strcmp to check CDMode
This commit is contained in:
parent
4a8994b96d
commit
8d70cdd896
4 changed files with 3 additions and 14 deletions
|
@ -538,7 +538,7 @@ global void ShowIntro(const Intro *intro)
|
|||
CallbackMusicOn();
|
||||
StopMusic();
|
||||
// FIXME: should this be GameMusic?
|
||||
if (CDMode == "off")
|
||||
if (!strcmp(CDMode, "off"))
|
||||
{
|
||||
PlayMusic(MenuMusic);
|
||||
}
|
||||
|
|
|
@ -440,17 +440,6 @@ global void PlayMusic(const char* name)
|
|||
Sample* sample;
|
||||
#endif
|
||||
|
||||
/*
|
||||
#if defined(USE_SDLCD) || defined(USE_LIBCDA) || defined(USE_CDDA)
|
||||
if (PlayCDRom(name)) {
|
||||
return;
|
||||
}
|
||||
if (strcmp(CDMode, ":off") && strcmp(CDMode, ":stopped")) {
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
*/
|
||||
|
||||
if (MusicOff) {
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -1200,7 +1200,7 @@ global int InitSound(void)
|
|||
DebugLevel0Fn("FIXME: must write non GLIB hash functions\n");
|
||||
#endif
|
||||
|
||||
if( TitleMusic && (CDMode == "off") ) {
|
||||
if( TitleMusic && (!strcmp(CDMode, "off")) ) {
|
||||
PlayMusic(TitleMusic);
|
||||
}
|
||||
|
||||
|
|
|
@ -1075,7 +1075,7 @@ global void MenuLoop(char* filename, WorldMap* map)
|
|||
// FIXME: If second loop?
|
||||
|
||||
if( !PlayingMusic && strcmp(TitleMusic,MenuMusic)
|
||||
&& (CDMode == "off") ) {
|
||||
&& (!strcmp(CDMode, "off")) ) {
|
||||
PlayMusic(MenuMusic);
|
||||
}
|
||||
EnableRedraw=RedrawMenu;
|
||||
|
|
Loading…
Reference in a new issue