projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed bugs when using music sets without unconfigured game music
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index a7e164399780cb99346e4c08178b97d35cd22ed3..d48ba4ecf99d7edfc588828899b5c149729b91dc 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-3595,11
+3595,23
@@
void HandleInfoScreen_Music(int dx, int dy, int button)
ystart += ystep_head;
}
ystart += ystep_head;
}
- int music_level_nr = -1;
- int i;
+ if (!strEqual(list->played, UNKNOWN_NAME))
+ {
+ if (!strEqual(list->played_header, UNKNOWN_NAME))
+ DrawTextSCentered(ystart, font_head, list->played_header);
+ else
+ DrawTextSCentered(ystart, font_head, "played in");
- if (!list->is_sound)
+ ystart += ystep_head;
+
+ DrawTextFCentered(ystart, font_text, "%s", list->played);
+ ystart += ystep_head;
+ }
+ else if (!list->is_sound)
{
{
+ int music_level_nr = -1;
+ int i;
+
// check if this music is configured for a certain level
for (i = leveldir_current->first_level;
i <= leveldir_current->last_level; i++)
// check if this music is configured for a certain level
for (i = leveldir_current->first_level;
i <= leveldir_current->last_level; i++)
@@
-3616,7
+3628,11
@@
void HandleInfoScreen_Music(int dx, int dy, int button)
if (music_level_nr != -1)
{
if (music_level_nr != -1)
{
- DrawTextSCentered(ystart, font_head, "played in");
+ if (!strEqual(list->played_header, UNKNOWN_NAME))
+ DrawTextSCentered(ystart, font_head, list->played_header);
+ else
+ DrawTextSCentered(ystart, font_head, "played in");
+
ystart += ystep_head;
DrawTextFCentered(ystart, font_text, "level %03d", music_level_nr);
ystart += ystep_head;
DrawTextFCentered(ystart, font_text, "level %03d", music_level_nr);