#define SETUP_MODE_SHORTCUTS_3 12
#define SETUP_MODE_SHORTCUTS_4 13
#define SETUP_MODE_SHORTCUTS_5 14
+#define SETUP_MODE_SHORTCUTS_6 15
// sub-screens on the setup screen (generic)
-#define SETUP_MODE_CHOOSE_ARTWORK 15
-#define SETUP_MODE_CHOOSE_OTHER 16
+#define SETUP_MODE_CHOOSE_ARTWORK 16
+#define SETUP_MODE_CHOOSE_OTHER 17
// sub-screens on the setup screen (specific)
-#define SETUP_MODE_CHOOSE_SCORES_TYPE 17
-#define SETUP_MODE_CHOOSE_GAME_SPEED 18
-#define SETUP_MODE_CHOOSE_SCROLL_DELAY 19
-#define SETUP_MODE_CHOOSE_SNAPSHOT_MODE 20
-#define SETUP_MODE_CHOOSE_BD_PALETTE_C64 21
-#define SETUP_MODE_CHOOSE_BD_PALETTE_C64DTV 22
-#define SETUP_MODE_CHOOSE_BD_PALETTE_ATARI 23
-#define SETUP_MODE_CHOOSE_WINDOW_SIZE 24
-#define SETUP_MODE_CHOOSE_SCALING_TYPE 25
-#define SETUP_MODE_CHOOSE_RENDERING 26
-#define SETUP_MODE_CHOOSE_VSYNC 27
-#define SETUP_MODE_CHOOSE_GRAPHICS 28
-#define SETUP_MODE_CHOOSE_SOUNDS 29
-#define SETUP_MODE_CHOOSE_MUSIC 30
-#define SETUP_MODE_CHOOSE_VOLUME_SIMPLE 31
-#define SETUP_MODE_CHOOSE_VOLUME_LOOPS 32
-#define SETUP_MODE_CHOOSE_VOLUME_MUSIC 33
-#define SETUP_MODE_CHOOSE_TOUCH_CONTROL 34
-#define SETUP_MODE_CHOOSE_MOVE_DISTANCE 35
-#define SETUP_MODE_CHOOSE_DROP_DISTANCE 36
-#define SETUP_MODE_CHOOSE_TRANSPARENCY 37
-#define SETUP_MODE_CHOOSE_GRID_XSIZE_0 38
-#define SETUP_MODE_CHOOSE_GRID_YSIZE_0 39
-#define SETUP_MODE_CHOOSE_GRID_XSIZE_1 40
-#define SETUP_MODE_CHOOSE_GRID_YSIZE_1 41
-#define SETUP_MODE_CONFIG_VIRT_BUTTONS 42
-
-#define MAX_SETUP_MODES 43
+#define SETUP_MODE_CHOOSE_SCORES_TYPE 18
+#define SETUP_MODE_CHOOSE_GAME_SPEED 19
+#define SETUP_MODE_CHOOSE_SCROLL_DELAY 20
+#define SETUP_MODE_CHOOSE_SNAPSHOT_MODE 21
+#define SETUP_MODE_CHOOSE_GAME_ENGINE_TYPE 22
+#define SETUP_MODE_CHOOSE_BD_PALETTE_C64 23
+#define SETUP_MODE_CHOOSE_BD_PALETTE_C64DTV 24
+#define SETUP_MODE_CHOOSE_BD_PALETTE_ATARI 25
+#define SETUP_MODE_CHOOSE_BD_COLOR_TYPE 26
+#define SETUP_MODE_CHOOSE_WINDOW_SIZE 27
+#define SETUP_MODE_CHOOSE_SCALING_TYPE 28
+#define SETUP_MODE_CHOOSE_RENDERING 29
+#define SETUP_MODE_CHOOSE_VSYNC 30
+#define SETUP_MODE_CHOOSE_GRAPHICS 31
+#define SETUP_MODE_CHOOSE_SOUNDS 32
+#define SETUP_MODE_CHOOSE_MUSIC 33
+#define SETUP_MODE_CHOOSE_VOLUME_SIMPLE 34
+#define SETUP_MODE_CHOOSE_VOLUME_LOOPS 35
+#define SETUP_MODE_CHOOSE_VOLUME_MUSIC 36
+#define SETUP_MODE_CHOOSE_TOUCH_CONTROL 37
+#define SETUP_MODE_CHOOSE_MOVE_DISTANCE 38
+#define SETUP_MODE_CHOOSE_DROP_DISTANCE 39
+#define SETUP_MODE_CHOOSE_TRANSPARENCY 40
+#define SETUP_MODE_CHOOSE_GRID_XSIZE_0 41
+#define SETUP_MODE_CHOOSE_GRID_YSIZE_0 42
+#define SETUP_MODE_CHOOSE_GRID_XSIZE_1 43
+#define SETUP_MODE_CHOOSE_GRID_YSIZE_1 44
+#define SETUP_MODE_CONFIG_VIRT_BUTTONS 45
+
+#define MAX_SETUP_MODES 46
#define MAX_MENU_MODES MAX(MAX_INFO_MODES, MAX_SETUP_MODES)
#define STR_SETUP_CHOOSE_GAME_SPEED "Game Speed"
#define STR_SETUP_CHOOSE_SCROLL_DELAY "Scroll Delay"
#define STR_SETUP_CHOOSE_SNAPSHOT_MODE "Snapshot Mode"
+#define STR_SETUP_CHOOSE_GAME_ENGINE_TYPE "Game Engine"
#define STR_SETUP_CHOOSE_BD_PALETTE_C64 "Palette (C64)"
#define STR_SETUP_CHOOSE_BD_PALETTE_C64DTV "Palette (C64DTV)"
#define STR_SETUP_CHOOSE_BD_PALETTE_ATARI "Palette (Atari)"
+#define STR_SETUP_CHOOSE_BD_COLOR_TYPE "Color Type"
#define STR_SETUP_CHOOSE_WINDOW_SIZE "Window Scaling"
#define STR_SETUP_CHOOSE_SCALING_TYPE "Anti-Aliasing"
#define STR_SETUP_CHOOSE_RENDERING "Rendering Mode"
static void ConfigureVirtualButtons(void);
static void execSetupGame(void);
static void execSetupEngines(void);
+static void execSetupEditor(void);
static void execSetupGraphics(void);
static void execSetupSound(void);
static void execSetupTouch(void);
static TreeInfo *snapshot_modes = NULL;
static TreeInfo *snapshot_mode_current = NULL;
+static TreeInfo *game_engine_types = NULL;
+static TreeInfo *game_engine_type_current = NULL;
+
static TreeInfo *bd_palettes_c64 = NULL;
static TreeInfo *bd_palette_c64_current = NULL;
static TreeInfo *bd_palettes_atari = NULL;
static TreeInfo *bd_palette_atari_current = NULL;
+static TreeInfo *bd_color_types = NULL;
+static TreeInfo *bd_color_type_current = NULL;
+
static TreeInfo *scores_types = NULL;
static TreeInfo *scores_type_current = NULL;
{ NULL, NULL },
};
+static struct ValueTextInfo game_engine_types_list[] =
+{
+ { GAME_ENGINE_TYPE_RND, "Rocks'n'Diamonds" },
+ { GAME_ENGINE_TYPE_BD, "Boulder Dash" },
+ { GAME_ENGINE_TYPE_EM, "Emerald Mine" },
+ { GAME_ENGINE_TYPE_SP, "Supaplex" },
+ { GAME_ENGINE_TYPE_MM, "Mirror Magic" },
+
+ { -1, NULL }
+};
+
static struct ValueTextInfo bd_palettes_c64_list[] =
{
{ GD_PALETTE_C64_VICE_NEW, "Vice new" },
{ -1, NULL },
};
+static struct ValueTextInfo bd_color_types_list[] =
+{
+ { GD_COLOR_TYPE_RGB, "RGB colors" },
+ { GD_COLOR_TYPE_C64, "C64 colors" },
+ { GD_COLOR_TYPE_C64DTV, "C64DTV colors" },
+ { GD_COLOR_TYPE_ATARI, "Atari colors" },
+
+ { -1, NULL },
+};
+
static struct ValueTextInfo volumes_list[] =
{
{ 0, "0 %" },
INFO_MODE_MAIN)
#define DRAW_MODE_SETUP(i) ((i) >= SETUP_MODE_MAIN && \
- (i) <= SETUP_MODE_SHORTCUTS_5 ? (i) : \
+ (i) <= SETUP_MODE_SHORTCUTS_6 ? (i) : \
(i) >= SETUP_MODE_CHOOSE_GRAPHICS && \
(i) <= SETUP_MODE_CHOOSE_MUSIC ? \
SETUP_MODE_CHOOSE_ARTWORK : \
SetAnimationFirstLevel(leveldir_current->first_level);
// level_nr may have been set to value over handicap with level editor
- if (setup.handicap && level_nr > leveldir_current->handicap_level)
+ if (setup.allow_skipping_levels != STATE_TRUE && level_nr > leveldir_current->handicap_level)
level_nr = leveldir_current->handicap_level;
LoadLevel(level_nr);
if (new_level_nr > leveldir_current->last_level)
new_level_nr = leveldir_current->last_level;
- if (setup.handicap && new_level_nr > leveldir_current->handicap_level)
+ if (setup.allow_skipping_levels != STATE_TRUE && new_level_nr > leveldir_current->handicap_level)
{
// skipping levels is only allowed when trying to skip single level
// (also, skipping BD style intermission levels is always possible)
if (new_level_nr == old_level_nr + 1 &&
(level.bd_intermission ||
- (setup.skip_levels && Request("Level still unsolved! Skip it anyway?", REQ_ASK))))
+ (setup.allow_skipping_levels == STATE_ASK &&
+ Request("Level still unsolved! Skip it anyway?", REQ_ASK))))
{
leveldir_current->handicap_level++;
SaveLevelSetup_SeriesInfo();
if (type & (TYPE_SWITCH |
TYPE_YES_NO |
TYPE_YES_NO_AUTO |
+ TYPE_YES_NO_ASK |
TYPE_STRING |
TYPE_PLAYER |
TYPE_ECS_AGA |
if (menu_info[choice].type & menu_navigation_type ||
menu_info[choice].type & TYPE_BOOLEAN_STYLE ||
menu_info[choice].type & TYPE_YES_NO_AUTO ||
+ menu_info[choice].type & TYPE_YES_NO_ASK ||
menu_info[choice].type & TYPE_PLAYER)
button = MB_MENU_CHOICE;
}
setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY ||
setup_mode == SETUP_MODE_CHOOSE_SNAPSHOT_MODE)
execSetupGame();
- else if (setup_mode == SETUP_MODE_CHOOSE_BD_PALETTE_C64 ||
+ else if (setup_mode == SETUP_MODE_CHOOSE_GAME_ENGINE_TYPE ||
+ setup_mode == SETUP_MODE_CHOOSE_BD_PALETTE_C64 ||
setup_mode == SETUP_MODE_CHOOSE_BD_PALETTE_C64DTV ||
- setup_mode == SETUP_MODE_CHOOSE_BD_PALETTE_ATARI)
+ setup_mode == SETUP_MODE_CHOOSE_BD_PALETTE_ATARI ||
+ setup_mode == SETUP_MODE_CHOOSE_BD_COLOR_TYPE)
execSetupEngines();
else if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE ||
setup_mode == SETUP_MODE_CHOOSE_SCALING_TYPE ||
setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY ||
setup_mode == SETUP_MODE_CHOOSE_SNAPSHOT_MODE)
execSetupGame();
- else if (setup_mode == SETUP_MODE_CHOOSE_BD_PALETTE_C64 ||
+ else if (setup_mode == SETUP_MODE_CHOOSE_GAME_ENGINE_TYPE ||
+ setup_mode == SETUP_MODE_CHOOSE_BD_PALETTE_C64 ||
setup_mode == SETUP_MODE_CHOOSE_BD_PALETTE_C64DTV ||
- setup_mode == SETUP_MODE_CHOOSE_BD_PALETTE_ATARI)
+ setup_mode == SETUP_MODE_CHOOSE_BD_PALETTE_ATARI ||
+ setup_mode == SETUP_MODE_CHOOSE_BD_COLOR_TYPE)
execSetupEngines();
else if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE ||
setup_mode == SETUP_MODE_CHOOSE_SCALING_TYPE ||
setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY ||
setup_mode == SETUP_MODE_CHOOSE_SNAPSHOT_MODE)
execSetupGame();
- else if (setup_mode == SETUP_MODE_CHOOSE_BD_PALETTE_C64 ||
+ else if (setup_mode == SETUP_MODE_CHOOSE_GAME_ENGINE_TYPE ||
+ setup_mode == SETUP_MODE_CHOOSE_BD_PALETTE_C64 ||
setup_mode == SETUP_MODE_CHOOSE_BD_PALETTE_C64DTV ||
- setup_mode == SETUP_MODE_CHOOSE_BD_PALETTE_ATARI)
+ setup_mode == SETUP_MODE_CHOOSE_BD_PALETTE_ATARI ||
+ setup_mode == SETUP_MODE_CHOOSE_BD_COLOR_TYPE)
execSetupEngines();
else if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE ||
setup_mode == SETUP_MODE_CHOOSE_SCALING_TYPE ||
if (new_level_nr > leveldir_current->last_level)
new_level_nr = leveldir_current->last_level;
- if (setup.handicap && new_level_nr > leveldir_current->handicap_level)
+ if (setup.allow_skipping_levels != STATE_TRUE && new_level_nr > leveldir_current->handicap_level)
new_level_nr = leveldir_current->handicap_level;
if (new_level_nr != old_level_nr)
static char *vsync_mode_text;
static char *scroll_delay_text;
static char *snapshot_mode_text;
+static char *game_engine_type_text;
static char *bd_palette_c64_text;
static char *bd_palette_c64dtv_text;
static char *bd_palette_atari_text;
+static char *bd_color_type_text;
static char *game_speed_text;
static char *scores_type_text;
static char *network_server_text;
DrawSetupScreen();
}
+static void execSetupEngines_setGameEngineType(void)
+{
+ if (game_engine_types == NULL)
+ {
+ int i;
+
+ for (i = 0; game_engine_types_list[i].value != -1; i++)
+ {
+ TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
+ char identifier[32], name[32];
+ int value = game_engine_types_list[i].value;
+ char *text = game_engine_types_list[i].text;
+
+ ti->node_top = &game_engine_types;
+ ti->sort_priority = value;
+
+ sprintf(identifier, "%d", value);
+ sprintf(name, "%s", text);
+
+ setString(&ti->identifier, identifier);
+ setString(&ti->name, name);
+ setString(&ti->name_sorting, name);
+ setString(&ti->infotext, STR_SETUP_CHOOSE_GAME_ENGINE_TYPE);
+
+ pushTreeInfo(&game_engine_types, ti);
+ }
+
+ // sort game engine type values to start with lowest game engine type value
+ sortTreeInfo(&game_engine_types);
+
+ // set current game engine type value to configured game engine type value
+ game_engine_type_current =
+ getTreeInfoFromIdentifier(game_engine_types, i_to_a(setup.default_game_engine_type));
+
+ // if that fails, set current game engine type to reliable default value
+ if (game_engine_type_current == NULL)
+ game_engine_type_current =
+ getTreeInfoFromIdentifier(game_engine_types, i_to_a(GAME_ENGINE_TYPE_RND));
+
+ // if that also fails, set current game engine type to first available value
+ if (game_engine_type_current == NULL)
+ game_engine_type_current = game_engine_types;
+ }
+
+ setup.default_game_engine_type = atoi(game_engine_type_current->identifier);
+
+ // needed for displaying game engine type text instead of identifier
+ game_engine_type_text = game_engine_type_current->name;
+}
+
static void execSetupEngines_setPalettesC64(void)
{
if (bd_palettes_c64 == NULL)
bd_palette_atari_text = bd_palette_atari_current->name;
}
+static void execSetupEngines_setColorType(void)
+{
+ if (bd_color_types == NULL)
+ {
+ int i;
+
+ for (i = 0; bd_color_types_list[i].value != -1; i++)
+ {
+ TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
+ char identifier[32], name[32];
+ int value = bd_color_types_list[i].value;
+ char *text = bd_color_types_list[i].text;
+
+ ti->node_top = &bd_color_types;
+ ti->sort_priority = value;
+
+ sprintf(identifier, "%d", value);
+ sprintf(name, "%s", text);
+
+ setString(&ti->identifier, identifier);
+ setString(&ti->name, name);
+ setString(&ti->name_sorting, name);
+ setString(&ti->infotext, STR_SETUP_CHOOSE_BD_COLOR_TYPE);
+
+ pushTreeInfo(&bd_color_types, ti);
+ }
+
+ // sort color type values to start with lowest color type value
+ sortTreeInfo(&bd_color_types);
+
+ // set current color type value to configured color type value
+ bd_color_type_current =
+ getTreeInfoFromIdentifier(bd_color_types, i_to_a(setup.bd_default_color_type));
+
+ // if that fails, set current color type to reliable default value
+ if (bd_color_type_current == NULL)
+ bd_color_type_current =
+ getTreeInfoFromIdentifier(bd_color_types, i_to_a(GD_DEFAULT_COLOR_TYPE));
+
+ // if that also fails, set current color type to first available value
+ if (bd_color_type_current == NULL)
+ bd_color_type_current = bd_color_types;
+ }
+
+ setup.bd_default_color_type = atoi(bd_color_type_current->identifier);
+
+ // needed for displaying color type text instead of identifier
+ bd_color_type_text = bd_color_type_current->name;
+}
+
static void execSetupEngines(void)
{
setup_mode = SETUP_MODE_ENGINES;
+ execSetupEngines_setGameEngineType();
execSetupEngines_setPalettesC64();
execSetupEngines_setPalettesC64DTV();
execSetupEngines_setPalettesAtari();
+ execSetupEngines_setColorType();
+
+ DrawSetupScreen();
+}
+
+static void execSetupChooseGameEngineType(void)
+{
+ setup_mode = SETUP_MODE_CHOOSE_GAME_ENGINE_TYPE;
DrawSetupScreen();
}
DrawSetupScreen();
}
+static void execSetupChooseColorType(void)
+{
+ setup_mode = SETUP_MODE_CHOOSE_BD_COLOR_TYPE;
+
+ DrawSetupScreen();
+}
+
static void execSetupEditor(void)
{
setup_mode = SETUP_MODE_EDITOR;
DrawSetupScreen();
}
+static void execSetupShortcuts6(void)
+{
+ setup_mode = SETUP_MODE_SHORTCUTS_6;
+
+ DrawSetupScreen();
+}
+
static void execExitSetup(void)
{
SetGameStatus(GAME_MODE_MAIN);
{ &setup.engine_snapshot_mode, execSetupChooseSnapshotMode },
{ &setup.engine_snapshot_mode, &snapshot_mode_text },
+ { &setup.default_game_engine_type, execSetupChooseGameEngineType },
+ { &setup.default_game_engine_type, &game_engine_type_text },
+
+ { &setup.bd_palette_c64, execSetupChoosePaletteC64 },
+ { &setup.bd_palette_c64, &bd_palette_c64_text },
+
+ { &setup.bd_palette_c64dtv, execSetupChoosePaletteC64DTV },
+ { &setup.bd_palette_c64dtv, &bd_palette_c64dtv_text },
+
+ { &setup.bd_palette_atari, execSetupChoosePaletteAtari },
+ { &setup.bd_palette_atari, &bd_palette_atari_text },
+
+ { &setup.bd_default_color_type, execSetupChooseColorType },
+ { &setup.bd_default_color_type, &bd_color_type_text },
+
{ &setup.window_scaling_percent, execSetupChooseWindowSize },
{ &setup.window_scaling_percent, &window_size_text },
{ &setup.internal.menu_shortcuts_tape, execSetupShortcuts3 },
{ &setup.internal.menu_shortcuts_sound, execSetupShortcuts4 },
{ &setup.internal.menu_shortcuts_snap, execSetupShortcuts5 },
+ { &setup.internal.menu_shortcuts_speed, execSetupShortcuts6 },
{ &setup.internal.info_title, execInfoTitleScreen },
{ &setup.internal.info_elements, execInfoElements },
{ TYPE_SWITCH, &setup.multiple_users, "Multiple Users/Teams:" },
{ TYPE_YES_NO, &setup.input_on_focus, "Only Move Focussed Player:" },
{ TYPE_SWITCH, &setup.time_limit, "Time Limit:" },
+#if 1
+ { TYPE_YES_NO_ASK, &setup.allow_skipping_levels, "Allow Skipping Levels:" },
+#else
{ TYPE_SWITCH, &setup.handicap, "Force Solving Levels:" },
{ TYPE_SWITCH, &setup.skip_levels, "Allow Skipping Levels:" },
+#endif
{ TYPE_SWITCH, &setup.increment_levels, "Increment Solved Levels:" },
{ TYPE_SWITCH, &setup.auto_play_next_level, "Auto-play Next Level:" },
{ TYPE_SWITCH, &setup.count_score_after_game, "Count Score After Game:" },
static struct TokenInfo setup_info_engines[] =
{
+ { TYPE_ENTER_LIST, &execSetupChooseGameEngineType, "Default Game Engine:" },
+ { TYPE_STRING, &game_engine_type_text, "" },
+ { TYPE_EMPTY, NULL, "" },
+ { TYPE_ECS_AGA, &setup.prefer_aga_graphics, "Game Graphics Style:" },
+ { TYPE_EMPTY, NULL, "" },
{ 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_SWITCH, &setup.bd_scroll_delay, "Scroll Delay:" },
{ TYPE_YES_NO_AUTO, &setup.bd_smooth_movements, "Smooth Element Movement:" },
+ { TYPE_YES_NO_AUTO, &setup.bd_pushing_graphics, "Player Pushing Graphics:" },
+ { TYPE_YES_NO_AUTO, &setup.bd_up_down_graphics, "Player Up/Down Graphics:" },
+ { TYPE_YES_NO_AUTO, &setup.bd_falling_sounds, "Double Falling Sounds:" },
+ { TYPE_SWITCH, &setup.bd_show_invisible_outbox,"Show invisible outbox:" },
{ TYPE_ENTER_LIST, &execSetupChoosePaletteC64, "Color Palette (C64):" },
{ TYPE_STRING, &bd_palette_c64_text, "" },
{ TYPE_ENTER_LIST, &execSetupChoosePaletteC64DTV, "Color Palette (C64DTV):" },
{ TYPE_STRING, &bd_palette_c64dtv_text, "" },
{ TYPE_ENTER_LIST, &execSetupChoosePaletteAtari, "Color Palette (Atari):" },
{ TYPE_STRING, &bd_palette_atari_text, "" },
+ { TYPE_ENTER_LIST, &execSetupChooseColorType, "Preferred Color Type:" },
+ { TYPE_STRING, &bd_color_type_text, "" },
+ { TYPE_SWITCH, &setup.bd_random_colors, "Random Colors:" },
{ 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_SWITCH, &setup.prefer_lowpass_sounds, "Low-Pass Filter Sounds:" },
{ TYPE_SWITCH, &setup.prefer_extra_panel_items,"Show Dynamite and Keys:" },
{ TYPE_EMPTY, NULL, "" },
#if 0
{ TYPE_SWITCH, &setup.editor.el_headlines, "Headlines:" },
#endif
- { TYPE_SWITCH, &setup.editor.el_user_defined, "User defined element list:" },
+ { TYPE_SWITCH, &setup.editor.el_user_defined, "User defined element list:" },
{ TYPE_SWITCH, &setup.editor.el_dynamic, "Dynamic level elements:" },
{ TYPE_EMPTY, NULL, "" },
#if 0
{ TYPE_SWITCH, &setup.editor.el_by_type, "Show elements by type:" },
{ TYPE_EMPTY, NULL, "" },
#endif
- { TYPE_SWITCH, &setup.editor.show_element_token, "Show element token:" },
+ { TYPE_SWITCH, &setup.editor.show_element_token, "Show element token:" },
+ { TYPE_SWITCH, &setup.editor.fast_game_start, "Fast game start:" },
{ TYPE_EMPTY, NULL, "" },
- { TYPE_SWITCH, &setup.editor.show_read_only_warning, "Show read-only warning:" },
+ { TYPE_SWITCH, &setup.editor.show_read_only_warning, "Show read-only warning:" },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_LEAVE_MENU, execSetupMain, "Back" },
{ TYPE_ENTER_LIST, execSetupChooseVolumeMusic, "Music Volume:" },
{ TYPE_STRING, &volume_music_text, "" },
{ TYPE_EMPTY, NULL, "" },
+ { TYPE_SWITCH, &setup.audio_sample_rate_44100, "44100 Hz audio mixing:" },
+ { TYPE_EMPTY, NULL, "" },
{ TYPE_LEAVE_MENU, execSetupMain, "Back" },
{ 0, NULL, NULL }
{ TYPE_ENTER_MENU, execSetupShortcuts3, "Tape Buttons" },
{ TYPE_ENTER_MENU, execSetupShortcuts4, "Sound & Music" },
{ TYPE_ENTER_MENU, execSetupShortcuts5, "TAS Snap Keys" },
+ { TYPE_ENTER_MENU, execSetupShortcuts6, "Speed Keys" },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_LEAVE_MENU, execSetupMain, "Back" },
{ 0, NULL, NULL }
};
+static struct TokenInfo setup_info_shortcuts_6[] =
+{
+ { TYPE_KEYTEXT, NULL, "Fast Playing Speed:" },
+ { TYPE_KEY, &setup.shortcut.speed_fast, "" },
+ { TYPE_KEYTEXT, NULL, "Slow Playing Speed:" },
+ { TYPE_KEY, &setup.shortcut.speed_slow, "" },
+ { TYPE_EMPTY, NULL, "" },
+ { TYPE_LEAVE_MENU, execSetupShortcuts, "Back" },
+
+ { 0, NULL, NULL }
+};
+
static Key getSetupKey(void)
{
Key key = KSYM_UNDEFINED;
else if (type & TYPE_BOOLEAN_STYLE)
return (*(boolean *)value ? FONT_OPTION_ON : FONT_OPTION_OFF);
else if (type & TYPE_YES_NO_AUTO)
- return (*(int *)value == AUTO ? FONT_OPTION_ON :
- *(int *)value == FALSE ? FONT_OPTION_OFF : FONT_OPTION_ON);
+ return (*(int *)value == STATE_AUTO ? FONT_OPTION_ON :
+ *(int *)value == STATE_FALSE ? FONT_OPTION_OFF : FONT_OPTION_ON);
+ else if (type & TYPE_YES_NO_ASK)
+ return (*(int *)value == STATE_ASK ? FONT_OPTION_ON :
+ *(int *)value == STATE_FALSE ? FONT_OPTION_OFF : FONT_OPTION_ON);
else if (type & TYPE_PLAYER)
return FONT_VALUE_1;
else
{
*(int *)si->value =
(dx == -1 ?
- (*(int *)si->value == AUTO ? TRUE :
- *(int *)si->value == TRUE ? FALSE : AUTO) :
- (*(int *)si->value == TRUE ? AUTO :
- *(int *)si->value == AUTO ? FALSE : TRUE));
+ (*(int *)si->value == STATE_AUTO ? STATE_TRUE :
+ *(int *)si->value == STATE_TRUE ? STATE_FALSE : STATE_AUTO) :
+ (*(int *)si->value == STATE_TRUE ? STATE_AUTO :
+ *(int *)si->value == STATE_AUTO ? STATE_FALSE : STATE_TRUE));
+ }
+ else if (si->type & TYPE_YES_NO_ASK)
+ {
+ *(int *)si->value =
+ (dx == -1 ?
+ (*(int *)si->value == STATE_ASK ? STATE_TRUE :
+ *(int *)si->value == STATE_TRUE ? STATE_FALSE : STATE_ASK) :
+ (*(int *)si->value == STATE_TRUE ? STATE_ASK :
+ *(int *)si->value == STATE_ASK ? STATE_FALSE : STATE_TRUE));
}
else if (si->type & TYPE_KEY)
{
if (si->value == &setup.fullscreen)
ToggleFullscreenIfNeeded();
+ // audio sample rate may have changed at this point
+ if (si->value == &setup.audio_sample_rate_44100)
+ ToggleAudioSampleRateIfNeeded();
+
// network mode may have changed at this point
if (si->value == &setup.network_mode)
ToggleNetworkModeIfNeeded();
setup_info = setup_info_shortcuts_5;
title_string = STR_SETUP_SHORTCUTS;
}
+ else if (setup_mode == SETUP_MODE_SHORTCUTS_6)
+ {
+ setup_info = setup_info_shortcuts_6;
+ title_string = STR_SETUP_SHORTCUTS;
+ }
// use modified setup info without setup entries marked as hidden
setup_info = getSetupInfoFinal(setup_info);
DrawChooseTree(&scroll_delay_current);
else if (setup_mode == SETUP_MODE_CHOOSE_SNAPSHOT_MODE)
DrawChooseTree(&snapshot_mode_current);
+ else if (setup_mode == SETUP_MODE_CHOOSE_GAME_ENGINE_TYPE)
+ DrawChooseTree(&game_engine_type_current);
else if (setup_mode == SETUP_MODE_CHOOSE_BD_PALETTE_C64)
DrawChooseTree(&bd_palette_c64_current);
else if (setup_mode == SETUP_MODE_CHOOSE_BD_PALETTE_C64DTV)
DrawChooseTree(&bd_palette_c64dtv_current);
else if (setup_mode == SETUP_MODE_CHOOSE_BD_PALETTE_ATARI)
DrawChooseTree(&bd_palette_atari_current);
+ else if (setup_mode == SETUP_MODE_CHOOSE_BD_COLOR_TYPE)
+ DrawChooseTree(&bd_color_type_current);
else if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE)
DrawChooseTree(&window_size_current);
else if (setup_mode == SETUP_MODE_CHOOSE_SCALING_TYPE)
HandleChooseTree(mx, my, dx, dy, button, &scroll_delay_current);
else if (setup_mode == SETUP_MODE_CHOOSE_SNAPSHOT_MODE)
HandleChooseTree(mx, my, dx, dy, button, &snapshot_mode_current);
+ else if (setup_mode == SETUP_MODE_CHOOSE_GAME_ENGINE_TYPE)
+ HandleChooseTree(mx, my, dx, dy, button, &game_engine_type_current);
else if (setup_mode == SETUP_MODE_CHOOSE_BD_PALETTE_C64)
HandleChooseTree(mx, my, dx, dy, button, &bd_palette_c64_current);
else if (setup_mode == SETUP_MODE_CHOOSE_BD_PALETTE_C64DTV)
HandleChooseTree(mx, my, dx, dy, button, &bd_palette_c64dtv_current);
else if (setup_mode == SETUP_MODE_CHOOSE_BD_PALETTE_ATARI)
HandleChooseTree(mx, my, dx, dy, button, &bd_palette_atari_current);
+ else if (setup_mode == SETUP_MODE_CHOOSE_BD_COLOR_TYPE)
+ HandleChooseTree(mx, my, dx, dy, button, &bd_color_type_current);
else if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE)
HandleChooseTree(mx, my, dx, dy, button, &window_size_current);
else if (setup_mode == SETUP_MODE_CHOOSE_SCALING_TYPE)
SCREEN_CTRL_ID_SWITCH_ECS_AGA,
SCREEN_MASK_MAIN,
GD_EVENT_RELEASED | GD_EVENT_OFF_BORDERS,
- FALSE, "switch ECS/AGA chipset"
+ FALSE, "switch old/new graphics"
},
{
IMG_MENU_BUTTON_TOUCH_BACK, IMG_MENU_BUTTON_TOUCH_BACK, -1,
projects / rocksndiamonds.git / blobdiff