summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordarkvater <darkvater@openttd.org>2004-08-13 23:39:48 +0000
committerdarkvater <darkvater@openttd.org>2004-08-13 23:39:48 +0000
commitb7e14169f8c08e6d0b2921ea08738f09df6c3180 (patch)
treefa7faf6df5c7174199d6b2cfb46f342b7cbe5add
parent15d60c09f537558857975485274898ff4ad78f18 (diff)
downloadopenttd-b7e14169f8c08e6d0b2921ea08738f09df6c3180.tar.xz
(svn r50) -Fix hopefully the win98 crashes related to music/sound (orudge)
-rw-r--r--w32dm.c6
-rw-r--r--win32.c4
2 files changed, 6 insertions, 4 deletions
diff --git a/w32dm.c b/w32dm.c
index 2a6036fe4..7de6d5541 100644
--- a/w32dm.c
+++ b/w32dm.c
@@ -62,8 +62,10 @@ bool seeking = false;
static char * DMusicMidiStart(char **parm)
{
- InitDirectMusic();
- return 0;
+ if (InitDirectMusic() == true)
+ return(0);
+ else
+ return(false);
}
static void DMusicMidiStop()
diff --git a/win32.c b/win32.c
index 462230823..12523e67f 100644
--- a/win32.c
+++ b/win32.c
@@ -1774,10 +1774,10 @@ const DriverDesc _sound_driver_descs[] = {
const DriverDesc _music_driver_descs[] = {
{"null", "Null Music Driver", &_null_music_driver, 0},
- {"win32", "Win32 MIDI Driver", &_win32_music_driver, 1},
#ifdef WIN32_ENABLE_DIRECTMUSIC_SUPPORT
- {"dmusic", "DirectMusic MIDI Driver", &_dmusic_midi_driver, 2},
+ {"dmusic", "DirectMusic MIDI Driver", &_dmusic_midi_driver, 1},
#endif
+ {"win32", "Win32 MIDI Driver", &_win32_music_driver, 2},
{NULL}
};