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 9ceeffcddc8bb6cc665a32d6dd5edc4bb977d399..e4ac24cc79c16bea7862ff01f528e0a1a9633aee 100644
(file)
--- a/
src/sound.c
+++ b/
src/sound.c
@@
-627,7
+627,8
@@
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")))
@@
-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)