/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2002 Artsoft Entertainment *
+* (c) 1994-2006 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
if (leveldir_current == NULL) /* should never happen */
Error(ERR_EXIT, "leveldir_current == NULL");
- memset(&snd_ctrl, 0, sizeof(SoundControl)); /* to make valgrind happy */
+ clear_mem(&snd_ctrl, sizeof(SoundControl)); /* to make valgrind happy */
snd_ctrl.active = FALSE;
snd_ctrl.state = type;
{
if (!mixer[i].active)
{
- Error(ERR_RETURN, "Mixer_InsertSound: Channel %d inactive", i);
- Error(ERR_RETURN, "Mixer_InsertSound: This should never happen!");
+ Error(ERR_INFO, "Mixer_InsertSound: Channel %d inactive", i);
+ Error(ERR_INFO, "Mixer_InsertSound: This should never happen!");
mixer_active_channels--;
}
/* print some debugging information about audio channel usage */
for (i = audio.first_sound_channel; i < audio.num_channels; i++)
{
- Error(ERR_RETURN, "Mixer_InsertSound: %d [%d]: %ld (%ld)",
+ Error(ERR_INFO, "Mixer_InsertSound: %d [%d]: %ld (%ld)",
i, mixer[i].active, mixer[i].data_len, (long)mixer[i].data_ptr);
}
#endif
max_sample_size = fragment_size / (num_output_channels * sample_bytes);
/* first clear the last premixing buffer */
- memset(premix_last_buffer, 0,
- max_sample_size * num_output_channels * sizeof(long));
+ clear_mem(premix_last_buffer,
+ max_sample_size * num_output_channels * sizeof(long));
for (i = 0; i < audio.num_channels; i++)
{
}
if (draw_init_text)
- DrawInitText("Loading music:", 120, FC_GREEN);
+ DrawInitText("Loading music", 120, FC_GREEN);
while ((dir_entry = readdir(dir)) != NULL) /* loop until last dir entry */
{
else if (stereo_position > SOUND_MAX_RIGHT)
stereo_position = SOUND_MAX_RIGHT;
- memset(&snd_ctrl, 0, sizeof(SoundControl)); /* to make valgrind happy */
+ clear_mem(&snd_ctrl, sizeof(SoundControl)); /* to make valgrind happy */
snd_ctrl.active = TRUE;
snd_ctrl.nr = nr;
if (!audio.sound_available)
return;
- memset(&snd_ctrl, 0, sizeof(SoundControl)); /* to make valgrind happy */
+ clear_mem(&snd_ctrl, sizeof(SoundControl)); /* to make valgrind happy */
snd_ctrl.active = FALSE;
snd_ctrl.nr = nr;