projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved handling game music with negative ID from mixer to helper function
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index 43df704a17ea08c8301600f8276b3b75b79263c2..1230cf0ab482d1e455907ffba4c854c0677b48c8 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-8498,7
+8498,7
@@
void PlayMenuMusicExt(int music)
void PlayMenuMusic()
{
char *curr_music = getCurrentlyPlayingMusicFilename();
void PlayMenuMusic()
{
char *curr_music = getCurrentlyPlayingMusicFilename();
- char *next_music = getMusic
ListEntry(menu.music[game_status])->filename
;
+ char *next_music = getMusic
InfoEntryFilename(menu.music[game_status])
;
if (!strEqual(curr_music, next_music))
PlayMenuMusicExt(menu.music[game_status]);
if (!strEqual(curr_music, next_music))
PlayMenuMusicExt(menu.music[game_status]);
@@
-8518,7
+8518,7
@@
static void FadeMenuSounds()
static void FadeMenuMusic()
{
char *curr_music = getCurrentlyPlayingMusicFilename();
static void FadeMenuMusic()
{
char *curr_music = getCurrentlyPlayingMusicFilename();
- char *next_music = getMusic
ListEntry(menu.music[game_status])->filename
;
+ char *next_music = getMusic
InfoEntryFilename(menu.music[game_status])
;
if (!strEqual(curr_music, next_music))
FadeMusic();
if (!strEqual(curr_music, next_music))
FadeMusic();