projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added cropping text area gadgets that do not fit to the current viewport
[rocksndiamonds.git]
/
src
/
libgame
/
sound.c
diff --git
a/src/libgame/sound.c
b/src/libgame/sound.c
index 35c0a2465457b8f34e33423aa3a91213c7e0de3d..3d085a9dbe8f8f336d241978616723cbcb8ec465 100644
(file)
--- a/
src/libgame/sound.c
+++ b/
src/libgame/sound.c
@@
-591,7
+591,7
@@
static void LoadCustomMusic_NoConf(void)
{
static boolean draw_init_text = TRUE; // only draw at startup
static char *last_music_directory = NULL;
{
static boolean draw_init_text = TRUE; // only draw at startup
static char *last_music_directory = NULL;
- char *music_directory = getCustomMusicDirectory();
+ char *music_directory = getCustomMusicDirectory
_NoConf
();
Directory *dir;
DirectoryEntry *dir_entry;
int num_music = getMusicListSize();
Directory *dir;
DirectoryEntry *dir_entry;
int num_music = getMusicListSize();
@@
-741,6
+741,16
@@
static MusicInfo *getMusicInfoEntryFromMusicID(int pos)
return mus_info[list_pos];
}
return mus_info[list_pos];
}
+char *getSoundInfoEntryFilename(int pos)
+{
+ SoundInfo *snd_info = getSoundInfoEntryFromSoundID(pos);
+
+ if (snd_info == NULL)
+ return NULL;
+
+ return getBaseNamePtr(snd_info->source_filename);
+}
+
char *getMusicInfoEntryFilename(int pos)
{
MusicInfo *mus_info = getMusicInfoEntryFromMusicID(pos);
char *getMusicInfoEntryFilename(int pos)
{
MusicInfo *mus_info = getMusicInfoEntryFromMusicID(pos);
@@
-1103,7
+1113,7
@@
static void ReloadCustomMusic(void)
LoadCustomMusic_NoConf();
}
LoadCustomMusic_NoConf();
}
-void InitReloadCustomSounds(
char *set_identifier
)
+void InitReloadCustomSounds(
void
)
{
if (!audio.sound_available)
return;
{
if (!audio.sound_available)
return;
@@
-1111,7
+1121,7
@@
void InitReloadCustomSounds(char *set_identifier)
ReloadCustomSounds();
}
ReloadCustomSounds();
}
-void InitReloadCustomMusic(
char *set_identifier
)
+void InitReloadCustomMusic(
void
)
{
if (!audio.music_available)
return;
{
if (!audio.music_available)
return;