projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed R'n'D players from the editor palette when editing native BD levels
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index a7e164399780cb99346e4c08178b97d35cd22ed3..cb8f798547091a6e8b110f3414ebdd55fd1f2b0f 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-1792,6
+1792,9
@@
void DrawMainMenu(void)
// store valid level series information
leveldir_last_valid = leveldir_current;
// store valid level series information
leveldir_last_valid = leveldir_current;
+ // store first level of this level set for "level_nr" style animations
+ SetAnimationFirstLevel(leveldir_current->first_level);
+
// needed if last screen (level choice) changed graphics, sounds or music
ReloadCustomArtwork(0);
// needed if last screen (level choice) changed graphics, sounds or music
ReloadCustomArtwork(0);
@@
-3595,11
+3598,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");
+
+ ystart += ystep_head;
- if (!list->is_sound)
+ 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
+3631,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);
@@
-7456,6
+7475,10
@@
static struct TokenInfo setup_info_game[] =
static struct TokenInfo setup_info_engines[] =
{
static struct TokenInfo setup_info_engines[] =
{
+ { TYPE_HEADLINE, NULL, "Boulder Dash" },
+ { TYPE_SWITCH, &setup.bd_skip_uncovering, "Skip (un)covering screen:" },
+ { TYPE_SWITCH, &setup.bd_skip_hatching, "Skip hatching player:" },
+ { TYPE_EMPTY, NULL, "" },
{ TYPE_HEADLINE, NULL, "Emerald Mine" },
{ TYPE_SWITCH, &setup.forced_scroll_delay, "Scroll Delay:" },
{ TYPE_ECS_AGA, &setup.prefer_aga_graphics, "Amiga Graphics Chipset:" },
{ TYPE_HEADLINE, NULL, "Emerald Mine" },
{ TYPE_SWITCH, &setup.forced_scroll_delay, "Scroll Delay:" },
{ TYPE_ECS_AGA, &setup.prefer_aga_graphics, "Amiga Graphics Chipset:" },
@@
-7474,6
+7497,7
@@
static struct TokenInfo setup_info_editor[] =
{
#if 0
{ TYPE_SWITCH, &setup.editor.el_boulderdash, "Boulder Dash:" },
{
#if 0
{ TYPE_SWITCH, &setup.editor.el_boulderdash, "Boulder Dash:" },
+ { TYPE_SWITCH, &setup.editor.el_boulderdash_native, "Boulder Dash Native:" },
{ TYPE_SWITCH, &setup.editor.el_emerald_mine, "Emerald Mine:" },
{ TYPE_SWITCH, &setup.editor.el_emerald_mine_club, "Emerald Mine Club:" },
{ TYPE_SWITCH, &setup.editor.el_more, "Rocks'n'Diamonds:" },
{ TYPE_SWITCH, &setup.editor.el_emerald_mine, "Emerald Mine:" },
{ TYPE_SWITCH, &setup.editor.el_emerald_mine_club, "Emerald Mine Club:" },
{ TYPE_SWITCH, &setup.editor.el_more, "Rocks'n'Diamonds:" },
@@
-7529,7
+7553,7
@@
static struct TokenInfo setup_info_graphics[] =
{ TYPE_SWITCH, &setup.quick_switch, "Quick Player Focus Switch:" },
{ TYPE_SWITCH, &setup.quick_doors, "Quick Menu Doors:" },
{ TYPE_SWITCH, &setup.show_titlescreen,"Show Title Screens:" },
{ TYPE_SWITCH, &setup.quick_switch, "Quick Player Focus Switch:" },
{ TYPE_SWITCH, &setup.quick_doors, "Quick Menu Doors:" },
{ TYPE_SWITCH, &setup.show_titlescreen,"Show Title Screens:" },
- { TYPE_SWITCH, &setup.toons, "Show
Menu Animations:"
},
+ { TYPE_SWITCH, &setup.toons, "Show
Toons:"
},
{ TYPE_SWITCH, &setup.small_game_graphics, "Small Game Graphics:" },
{ TYPE_YES_NO_AUTO, &setup.debug.xsn_mode, debug_xsn_mode },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_SWITCH, &setup.small_game_graphics, "Small Game Graphics:" },
{ TYPE_YES_NO_AUTO, &setup.debug.xsn_mode, debug_xsn_mode },
{ TYPE_EMPTY, NULL, "" },