&setup.override_level_sounds :
&setup.override_level_music);
- if (set_identifier)
- free(set_identifier);
+ checked_free(set_identifier);
set_identifier = checked_malloc(snd_ctrl->data_len);
if (ti == NULL)
ti = *ti_ptr = checked_calloc(sizeof(TreeInfo));
- if (leveldir_current->fullpath != NULL)
- free(leveldir_current->fullpath);
- if (leveldir_current->sounds_path != NULL)
- free(leveldir_current->sounds_path);
- if (leveldir_current->music_path != NULL)
- free(leveldir_current->music_path);
- if (ti->basepath != NULL)
- free(ti->basepath);
- if (ti->fullpath != NULL)
- free(ti->fullpath);
+
+ checked_free(leveldir_current->fullpath);
+ checked_free(leveldir_current->sounds_path);
+ checked_free(leveldir_current->music_path);
+ checked_free(ti->basepath);
+ checked_free(ti->fullpath);
if (read(audio.mixer_pipe[0], set_identifier,
snd_ctrl->data_len) != snd_ctrl->data_len ||
struct dirent *dir_entry;
int num_music = getMusicListSize();
-#if 0
- int ii;
- for (ii = 0; ii < num_music; ii++)
- {
- struct FileInfo *music = getMusicListEntry(ii);
- printf("sound process: music %d: '%s'\n", ii, music->filename);
- }
-#endif
-
if (!audio.sound_available)
return;
boolean music_already_used = FALSE;
int i;
+ /* skip all music files that are configured in music config file */
for (i = 0; i < num_music; i++)
{
struct FileInfo *music = getMusicListEntry(i);
-#if 0
- printf("sound process: '%s'\n", music->filename);
-#endif
-
if (strcmp(basename, music->filename) == 0)
{
music_already_used = TRUE;
closedir(dir);
draw_init_text = FALSE;
-
- if (num_music_noconf == 0)
- Error(ERR_WARN, "cannot find any valid music files in directory '%s'",
- music_directory);
}
int getSoundListSize()
#endif
}
- if (sound->source_filename)
- free(sound->source_filename);
+ checked_free(sound->source_filename);
free(sound);
}