X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmsdos.c;h=0105f3f9c59ccdfdd535f87ff75d4cefd91f3c79;hb=61335f530816c74dfe9a299b156a8d239d9bd040;hp=4c84010f90e4eb59daf90befa3f556a4fefe466a;hpb=dfe0a71a9939e0c55bb54dcc92db1749e8e21747;p=rocksndiamonds.git diff --git a/src/libgame/msdos.c b/src/libgame/msdos.c index 4c84010f..0105f3f9 100644 --- a/src/libgame/msdos.c +++ b/src/libgame/msdos.c @@ -56,7 +56,7 @@ boolean wait_for_vsync; /* extern int playing_sounds; -extern struct SoundControl playlist[MAX_SOUNDS_PLAYING]; +extern struct SoundControl playlist[NUM_MIXER_CHANNELS]; extern struct SoundControl emptySoundControl; */ @@ -92,7 +92,7 @@ static void allegro_init_drivers() static boolean allegro_init_audio() { - reserve_voices(MAX_SOUNDS_PLAYING, 0); + reserve_voices(NUM_MIXER_CHANNELS, 0); if (install_sound(DIGI_AUTODETECT, MIDI_NONE, NULL) == -1) if (install_sound(DIGI_SB, MIDI_NONE, NULL) == -1) @@ -931,9 +931,13 @@ void MSDOSOpenAudio(void) audio.music_available = TRUE; audio.loops_available = TRUE; audio.sound_enabled = TRUE; - } - InitPlaylist(); + audio.num_channels = NUM_MIXER_CHANNELS; + audio.music_channel = MUSIC_CHANNEL; + audio.first_sound_channel = FIRST_SOUND_CHANNEL; + + Mixer_InitChannels(); + } } void MSDOSCloseAudio(void)