rnd-20070925-1-src

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

diff --git a/src/libgame/sound.c b/src/libgame/sound.c
index fc187139f9164b83e0ff4ab2d4c6e8f89624560d..d620dd93d0614b38ac5dfff9244d3abb518d5f7b 100644 (file)
--- a/src/libgame/sound.c
+++ b/src/libgame/sound.c
@@ -474,8 +474,8 @@ static void WriteReloadInfoToPipe(char *set_identifier, int type)
   unsigned long str_size4 = strlen(ti->basepath) + 1;
   unsigned long str_size5 = strlen(ti->fullpath) + 1;
   boolean override_level_artwork = (type == SND_CTRL_RELOAD_SOUNDS ?
-                                   setup.override_level_sounds :
-                                   setup.override_level_music);
+                                   gfx.override_level_sounds :
+                                   gfx.override_level_music);
 
   if (IS_CHILD_PROCESS())
     return;
@@ -534,8 +534,8 @@ static void ReadReloadInfoFromPipe(SoundControl *snd_ctrl)
   unsigned long str_size1, str_size2, str_size3, str_size4, str_size5;
   static char *set_identifier = NULL;
   boolean *override_level_artwork = (snd_ctrl->state & SND_CTRL_RELOAD_SOUNDS ?
-                                    &setup.override_level_sounds :
-                                    &setup.override_level_music);
+                                    &gfx.override_level_sounds :
+                                    &gfx.override_level_music);
 
   checked_free(set_identifier);
 
@@ -1559,6 +1559,8 @@ static void *Load_WAV(char *filename)
 
 #else /* AUDIO_UNIX_NATIVE */
 
+  clear_mem(&header, sizeof(struct SoundHeader_WAV));  /* to make gcc happy */
+
   if ((file = fopen(filename, MODE_READ)) == NULL)
   {
     Error(ERR_WARN, "cannot open sound file '%s'", filename);