X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=d10f0f2b7f94a6f3f286602e9f45eb7b3e59eba9;hb=bcb3453f710b95ec98b188b95574bea9ab336e96;hp=faa9a49d598344a6e8da3cf99f35e93c2136235d;hpb=8932f698c0831ab0e4ae2e03d64a48be1aeee82a;p=rocksndiamonds.git

diff --git a/src/libgame/sound.c b/src/libgame/sound.c
index faa9a49d..d10f0f2b 100644
--- a/src/libgame/sound.c
+++ b/src/libgame/sound.c
@@ -273,7 +273,7 @@ void SoundServer(void)
       static long max_sample_size = 0;
       static long fragment_size = DEFAULT_AUDIO_FRAGMENT_SIZE;
       int sample_rate = DEFAULT_AUDIO_SAMPLE_RATE;
-      boolean stereo = TRUE;
+      static boolean stereo = TRUE;
 
       if (playing_sounds ||
 	  (audio.device_fd = OpenAudioDevice(audio.device_name)) >= 0)
@@ -1080,21 +1080,10 @@ int LoadMusic(void)
   {
     char *filename = dir_entry->d_name;
 
-    if (strlen(filename) > 4 &&
-	strcmp(&filename[strlen(filename) - 4], ".wav") == 0)
-    {
-      if (LoadSoundExt(filename, TRUE))
-	num_wav_music++;
-    }
-    else if (strlen(filename) > 4 &&
-	     (strcmp(&filename[strlen(filename) - 4], ".mod") == 0 ||
-	      strcmp(&filename[strlen(filename) - 4], ".MOD") == 0 ||
-	      strncmp(filename, "mod.", 4) == 0 ||
-	      strncmp(filename, "MOD.", 4) == 0))
-    {
-      if (LoadMod(filename))
-	num_mod_music++;
-    }
+    if (FileIsSound(filename) && LoadSoundExt(filename, TRUE))
+      num_wav_music++;
+    else if (FileIsMusic(filename) && LoadMod(filename))
+      num_mod_music++;
   }
 
   closedir(dir);