projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20020526-1-src
[rocksndiamonds.git]
/
src
/
libgame
/
msdos.c
diff --git
a/src/libgame/msdos.c
b/src/libgame/msdos.c
index 4c84010f90e4eb59daf90befa3f556a4fefe466a..724338ce96538d8f4ca4560aaedeb91d5dd022be 100644
(file)
--- a/
src/libgame/msdos.c
+++ b/
src/libgame/msdos.c
@@
-54,12
+54,6
@@
static int global_colormap_entries_used = 0;
boolean wait_for_vsync;
boolean wait_for_vsync;
-/*
-extern int playing_sounds;
-extern struct SoundControl playlist[MAX_SOUNDS_PLAYING];
-extern struct SoundControl emptySoundControl;
-*/
-
static BITMAP *Read_PCX_to_AllegroBitmap(char *);
static void allegro_init_drivers()
static BITMAP *Read_PCX_to_AllegroBitmap(char *);
static void allegro_init_drivers()
@@
-92,7
+86,7
@@
static void allegro_init_drivers()
static boolean allegro_init_audio()
{
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)
if (install_sound(DIGI_AUTODETECT, MIDI_NONE, NULL) == -1)
if (install_sound(DIGI_SB, MIDI_NONE, NULL) == -1)
@@
-931,9
+925,13
@@
void MSDOSOpenAudio(void)
audio.music_available = TRUE;
audio.loops_available = TRUE;
audio.sound_enabled = TRUE;
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)
}
void MSDOSCloseAudio(void)