projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19981109-1
[rocksndiamonds.git]
/
src
/
sound.c
diff --git
a/src/sound.c
b/src/sound.c
index be825edc9a510d0f8554a685d518e34490824122..e4ac24cc79c16bea7862ff01f528e0a1a9633aee 100644
(file)
--- a/
src/sound.c
+++ b/
src/sound.c
@@
-627,18
+627,19
@@
boolean LoadSound(struct SoundInfo *snd_info)
struct SoundHeader_8SVX *sound_header;
unsigned char *ptr;
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")))
{
#ifndef MSDOS
if (!(file=fopen(filename,"r")))
{
- Error(ERR_
RETU
RN, "cannot open sound file '%s' - no sounds", filename);
+ Error(ERR_
WA
RN, "cannot open sound file '%s' - no sounds", filename);
return(FALSE);
}
if (fseek(file,0,SEEK_END)<0)
{
return(FALSE);
}
if (fseek(file,0,SEEK_END)<0)
{
- Error(ERR_
RETU
RN, "cannot read sound file '%s' - no sounds", filename);
+ Error(ERR_
WA
RN, "cannot read sound file '%s' - no sounds", filename);
fclose(file);
return(FALSE);
}
fclose(file);
return(FALSE);
}
@@
-648,14
+649,14
@@
boolean LoadSound(struct SoundInfo *snd_info)
if (!(snd_info->file_ptr=malloc(snd_info->file_len)))
{
if (!(snd_info->file_ptr=malloc(snd_info->file_len)))
{
- Error(ERR_
RETU
RN, "out of memory (this shouldn't happen :) - no sounds");
+ Error(ERR_
WA
RN, "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)
{
fclose(file);
return(FALSE);
}
if (fread(snd_info->file_ptr,1,snd_info->file_len,file)!=snd_info->file_len)
{
- Error(ERR_
RETU
RN, "cannot read sound file '%s' - no sounds", filename);
+ Error(ERR_
WA
RN, "cannot read sound file '%s' - no sounds", filename);
fclose(file);
return(FALSE);
}
fclose(file);
return(FALSE);
}
@@
-668,7
+669,7
@@
boolean LoadSound(struct SoundInfo *snd_info)
snd_info->file_len != be2long(&sound_header->chunk_size)+8 ||
strncmp(sound_header->magic_8SVX,"8SVX",4))
{
snd_info->file_len != be2long(&sound_header->chunk_size)+8 ||
strncmp(sound_header->magic_8SVX,"8SVX",4))
{
- Error(ERR_
RETU
RN, "'%s' is not an IFF/8SVX file or broken - no sounds",
+ Error(ERR_
WA
RN, "'%s' is not an IFF/8SVX file or broken - no sounds",
filename);
return(FALSE);
}
filename);
return(FALSE);
}
@@
-711,7
+712,7
@@
boolean LoadSound(struct SoundInfo *snd_info)
snd_info->sample_ptr = load_sample(filename);
if(!snd_info->sample_ptr)
{
snd_info->sample_ptr = load_sample(filename);
if(!snd_info->sample_ptr)
{
- Error(ERR_
RETU
RN, "cannot read sound file '%s' - no sounds", filename);
+ Error(ERR_
WA
RN, "cannot read sound file '%s' - no sounds", filename);
fclose(file);
return(FALSE);
}
fclose(file);
return(FALSE);
}
@@
-738,7
+739,7
@@
void PlaySoundExt(int nr, int volume, int stereo, boolean loop)
{
struct SoundControl snd_ctrl = emptySoundControl;
{
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)
return;
if (volume<PSND_MIN_VOLUME)
@@
-762,7
+763,7
@@
void PlaySoundExt(int nr, int volume, int stereo, boolean loop)
#ifndef MSDOS
if (write(sound_pipe[1], &snd_ctrl, sizeof(snd_ctrl))<0)
{
#ifndef MSDOS
if (write(sound_pipe[1], &snd_ctrl, sizeof(snd_ctrl))<0)
{
- Error(ERR_
RETU
RN, "cannot pipe to child process - no sounds");
+ Error(ERR_
WA
RN, "cannot pipe to child process - no sounds");
sound_status = SOUND_OFF;
return;
}
sound_status = SOUND_OFF;
return;
}
@@
-812,7
+813,7
@@
void StopSoundExt(int nr, int method)
#ifndef MSDOS
if (write(sound_pipe[1], &snd_ctrl, sizeof(snd_ctrl))<0)
{
#ifndef MSDOS
if (write(sound_pipe[1], &snd_ctrl, sizeof(snd_ctrl))<0)
{
- Error(ERR_
RETU
RN, "cannot pipe to child process - no sounds");
+ Error(ERR_
WA
RN, "cannot pipe to child process - no sounds");
sound_status = SOUND_OFF;
return;
}
sound_status = SOUND_OFF;
return;
}