rnd-20031116-2-src

[rocksndiamonds.git] / src / libgame / sound.c

diff --git a/src/libgame/sound.c b/src/libgame/sound.c
index 8b01135fea198c280f2a42e600ce668bbdf12b20..0e38c41961ad1fb4831d02eda3c3b1c8a45256f4 100644 (file)
--- a/src/libgame/sound.c
+++ b/src/libgame/sound.c
@@ -870,7 +870,7 @@ static void Mixer_InsertSound(SoundControl snd_ctrl)
   }
   else
   {
-    if (snd_ctrl.nr >= num_sounds)
+    if (snd_ctrl.nr < 0 || snd_ctrl.nr >= num_sounds)
       return;
 
     snd_info = getSoundInfoEntryFromSoundID(snd_ctrl.nr);
@@ -1866,6 +1866,20 @@ static void *Load_MOD(char *filename)
 #endif
 }
 
+static void *Load_WAV_or_MOD(char *filename)
+{
+  char *basename = strrchr(filename, '/');
+
+  basename = (basename != NULL ? basename + 1 : filename);
+
+  if (FileIsSound(basename))
+    return Load_WAV(filename);
+  else if (FileIsMusic(basename))
+    return Load_MOD(filename);
+  else
+    return NULL;
+}
+
 void LoadCustomMusic_NoConf(void)
 {
   static boolean draw_init_text = TRUE;                /* only draw at startup */
@@ -2183,7 +2197,7 @@ void InitMusicList(struct ConfigInfo *config_list, int num_file_list_entries,
 
   /* ---------- initialize artwork loading/freeing functions ---------- */
 
-  music_info->load_artwork = Load_MOD;
+  music_info->load_artwork = Load_WAV_or_MOD;
   music_info->free_artwork = FreeMusic;
 }