rnd-19981111-1

[rocksndiamonds.git] / src / sound.c

diff --git a/src/sound.c b/src/sound.c
index be825edc9a510d0f8554a685d518e34490824122..97484309228100bceaadd6772eb192094d76e09c 100644 (file)
--- a/src/sound.c
+++ b/src/sound.c
@@ -615,7 +615,87 @@ static unsigned long be2long(unsigned long *be)    /* big-endian -> longword */
   return(ptr[0]<<24 | ptr[1]<<16 | ptr[2]<<8 | ptr[3]);
 }
 
+static unsigned long le2long(unsigned long *be)        /* little-endian -> longword */
+{
+  unsigned char *ptr = (unsigned char *)be;
+
+  return(ptr[3]<<24 | ptr[2]<<16 | ptr[1]<<8 | ptr[0]);
+}
+
 boolean LoadSound(struct SoundInfo *snd_info)
+{
+  FILE *file;
+  char filename[256];
+  char *sound_ext = "wav";
+  struct SoundHeader_WAV *sound_header;
+  int i;
+
+  sprintf(filename, "%s/%s/%s.%s",
+         options.base_directory, SOUNDS_DIRECTORY, snd_info->name, sound_ext);
+
+#ifndef MSDOS
+  if ((file = fopen(filename, "r")) == NULL)
+  {
+    Error(ERR_WARN, "cannot open sound file '%s' - no sounds", filename);
+    return(FALSE);
+  }
+
+  if (fseek(file, 0, SEEK_END) < 0)
+  {
+    Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
+    fclose(file);
+    return(FALSE);
+  }
+
+  snd_info->file_len = ftell(file);
+  rewind(file);
+
+  snd_info->file_ptr = checked_malloc(snd_info->file_len);
+
+  if (fread(snd_info->file_ptr, 1, snd_info->file_len, file) !=
+      snd_info->file_len)
+  {
+    Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
+    fclose(file);
+    return(FALSE);
+  }
+
+  fclose(file);
+
+  sound_header = (struct SoundHeader_WAV *)snd_info->file_ptr;
+
+  if (strncmp(sound_header->magic_RIFF, "RIFF", 4) ||
+      snd_info->file_len != le2long(&sound_header->header_size) + 8 ||
+      strncmp(sound_header->magic_WAVE, "WAVE", 4) ||
+      strncmp(sound_header->magic_DATA, "data", 4) ||
+      snd_info->file_len != le2long(&sound_header->data_size) + 44)
+  {
+    Error(ERR_WARN, "'%s' is not a RIFF/WAVE file or broken - no sounds",
+         filename);
+    return(FALSE);
+  }
+
+  snd_info->data_ptr = snd_info->file_ptr + 44;
+  snd_info->data_len = le2long(&sound_header->data_size);
+
+  for (i=0; i<snd_info->data_len; i++)
+    snd_info->data_ptr[i] = snd_info->data_ptr[i]^0x80;
+
+#else
+
+  snd_info->sample_ptr = load_sample(filename);
+  if (!snd_info->sample_ptr)
+  {
+    Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
+    fclose(file);
+    return(FALSE);
+  }
+#endif /* MSDOS */
+
+  return(TRUE);
+}
+
+boolean LoadSound_8SVX(struct SoundInfo *snd_info)
 {
   FILE *file;
   char filename[256];
@@ -627,18 +707,19 @@ boolean LoadSound(struct SoundInfo *snd_info)
   struct SoundHeader_8SVX *sound_header;
   unsigned char *ptr;
 
-  sprintf(filename,"%s/%s.%s",SND_PATH,snd_info->name,sound_ext);
+  sprintf(filename, "%s/%s/%s.%s",
+         options.base_directory, SOUNDS_DIRECTORY, snd_info->name, sound_ext);
 
 #ifndef MSDOS
   if (!(file=fopen(filename,"r")))
   {
-    Error(ERR_RETURN, "cannot open sound file '%s' - no sounds", filename);
+    Error(ERR_WARN, "cannot open sound file '%s' - no sounds", filename);
     return(FALSE);
   }
 
   if (fseek(file,0,SEEK_END)<0)
   {
-    Error(ERR_RETURN, "cannot read sound file '%s' - no sounds", filename);
+    Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
     fclose(file);
     return(FALSE);
   }
@@ -648,14 +729,14 @@ boolean LoadSound(struct SoundInfo *snd_info)
 
   if (!(snd_info->file_ptr=malloc(snd_info->file_len)))
   {
-    Error(ERR_RETURN, "out of memory (this shouldn't happen :) - no sounds");
+    Error(ERR_WARN, "out of memory (this shouldn't happen :) - no sounds");
     fclose(file);
     return(FALSE);
   }
 
   if (fread(snd_info->file_ptr,1,snd_info->file_len,file)!=snd_info->file_len)
   {
-    Error(ERR_RETURN, "cannot read sound file '%s' - no sounds", filename);
+    Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
     fclose(file);
     return(FALSE);
   }
@@ -668,7 +749,7 @@ boolean LoadSound(struct SoundInfo *snd_info)
       snd_info->file_len != be2long(&sound_header->chunk_size)+8 ||
       strncmp(sound_header->magic_8SVX,"8SVX",4))
   {
-    Error(ERR_RETURN, "'%s' is not an IFF/8SVX file or broken - no sounds",
+    Error(ERR_WARN, "'%s' is not an IFF/8SVX file or broken - no sounds",
          filename);
     return(FALSE);
   }
@@ -711,7 +792,7 @@ boolean LoadSound(struct SoundInfo *snd_info)
   snd_info->sample_ptr = load_sample(filename);
   if(!snd_info->sample_ptr)
   {
-    Error(ERR_RETURN, "cannot read sound file '%s' - no sounds", filename);
+    Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
     fclose(file);
     return(FALSE);
   }
@@ -738,7 +819,7 @@ void PlaySoundExt(int nr, int volume, int stereo, boolean loop)
 {
   struct SoundControl snd_ctrl = emptySoundControl;
 
-  if (sound_status==SOUND_OFF || !setup.sound_on)
+  if (sound_status==SOUND_OFF || !setup.sound)
     return;
 
   if (volume<PSND_MIN_VOLUME)
@@ -762,7 +843,7 @@ void PlaySoundExt(int nr, int volume, int stereo, boolean loop)
 #ifndef MSDOS
   if (write(sound_pipe[1], &snd_ctrl, sizeof(snd_ctrl))<0)
   {
-    Error(ERR_RETURN, "cannot pipe to child process - no sounds");
+    Error(ERR_WARN, "cannot pipe to child process - no sounds");
     sound_status = SOUND_OFF;
     return;
   }
@@ -812,7 +893,7 @@ void StopSoundExt(int nr, int method)
 #ifndef MSDOS
   if (write(sound_pipe[1], &snd_ctrl, sizeof(snd_ctrl))<0)
   {
-    Error(ERR_RETURN, "cannot pipe to child process - no sounds");
+    Error(ERR_WARN, "cannot pipe to child process - no sounds");
     sound_status = SOUND_OFF;
     return;
   }