#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_WINDOW_SIZE 21
-#define SETUP_MODE_CHOOSE_SCALING_TYPE 22
-#define SETUP_MODE_CHOOSE_RENDERING 23
-#define SETUP_MODE_CHOOSE_VSYNC 24
-#define SETUP_MODE_CHOOSE_GRAPHICS 25
-#define SETUP_MODE_CHOOSE_SOUNDS 26
-#define SETUP_MODE_CHOOSE_MUSIC 27
-#define SETUP_MODE_CHOOSE_VOLUME_SIMPLE 28
-#define SETUP_MODE_CHOOSE_VOLUME_LOOPS 29
-#define SETUP_MODE_CHOOSE_VOLUME_MUSIC 30
-#define SETUP_MODE_CHOOSE_TOUCH_CONTROL 31
-#define SETUP_MODE_CHOOSE_MOVE_DISTANCE 32
-#define SETUP_MODE_CHOOSE_DROP_DISTANCE 33
-#define SETUP_MODE_CHOOSE_TRANSPARENCY 34
-#define SETUP_MODE_CHOOSE_GRID_XSIZE_0 35
-#define SETUP_MODE_CHOOSE_GRID_YSIZE_0 36
-#define SETUP_MODE_CHOOSE_GRID_XSIZE_1 37
-#define SETUP_MODE_CHOOSE_GRID_YSIZE_1 38
-#define SETUP_MODE_CONFIG_VIRT_BUTTONS 39
-
-#define MAX_SETUP_MODES 40
+#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_c64dtv = NULL;
+static TreeInfo *bd_palette_c64dtv_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;
static struct ValueTextInfo window_sizes_list[] =
{
- { 50, "50 %" },
- { 80, "80 %" },
- { 90, "90 %" },
- { 100, "100 % (Default)" },
- { 110, "110 %" },
- { 120, "120 %" },
- { 130, "130 %" },
- { 140, "140 %" },
- { 150, "150 %" },
- { 200, "200 %" },
- { 250, "250 %" },
- { 300, "300 %" },
-
- { -1, NULL },
+ { 50, "50 %" },
+ { 80, "80 %" },
+ { 90, "90 %" },
+ { 100, "100 % (Default)" },
+ { 110, "110 %" },
+ { 120, "120 %" },
+ { 130, "130 %" },
+ { 140, "140 %" },
+ { 150, "150 %" },
+ { 200, "200 %" },
+ { 250, "250 %" },
+ { 300, "300 %" },
+
+ { -1, NULL },
};
static struct StringValueTextInfo scaling_types_list[] =
{
- { SCALING_QUALITY_NEAREST, "Off" },
- { SCALING_QUALITY_LINEAR, "Linear" },
- { SCALING_QUALITY_BEST, "Anisotropic" },
+ { SCALING_QUALITY_NEAREST, "Off" },
+ { SCALING_QUALITY_LINEAR, "Linear" },
+ { SCALING_QUALITY_BEST, "Anisotropic" },
- { NULL, NULL },
+ { NULL, NULL },
};
static struct StringValueTextInfo rendering_modes_list[] =
{
- { STR_SPECIAL_RENDERING_OFF, "Off (May show artifacts, fast)" },
- { STR_SPECIAL_RENDERING_BITMAP, "Bitmap/Texture mode (slower)" },
+ { STR_SPECIAL_RENDERING_OFF, "Off (May show artifacts, fast)"},
+ { STR_SPECIAL_RENDERING_BITMAP, "Bitmap/Texture mode (slower)" },
#if DEBUG
// this mode may work under certain conditions, but does not work on Windows
- { STR_SPECIAL_RENDERING_TARGET, "Target Texture mode (slower)" },
+ { STR_SPECIAL_RENDERING_TARGET, "Target Texture mode (slower)" },
#endif
- { STR_SPECIAL_RENDERING_DOUBLE, "Double Texture mode (slower)" },
+ { STR_SPECIAL_RENDERING_DOUBLE, "Double Texture mode (slower)" },
- { NULL, NULL },
+ { NULL, NULL },
};
static struct StringValueTextInfo vsync_modes_list[] =
{
- { STR_VSYNC_MODE_OFF, "Off" },
- { STR_VSYNC_MODE_NORMAL, "Normal" },
- { STR_VSYNC_MODE_ADAPTIVE, "Adaptive" },
+ { STR_VSYNC_MODE_OFF, "Off" },
+ { STR_VSYNC_MODE_NORMAL, "Normal" },
+ { STR_VSYNC_MODE_ADAPTIVE, "Adaptive" },
- { NULL, NULL },
+ { NULL, NULL },
};
static struct StringValueTextInfo scores_types_list[] =
{
- { STR_SCORES_TYPE_LOCAL_ONLY, "Local scores only" },
- { STR_SCORES_TYPE_SERVER_ONLY, "Server scores only" },
- { STR_SCORES_TYPE_LOCAL_AND_SERVER, "Local and server scores" },
+ { STR_SCORES_TYPE_LOCAL_ONLY, "Local scores only" },
+ { STR_SCORES_TYPE_SERVER_ONLY, "Server scores only" },
+ { STR_SCORES_TYPE_LOCAL_AND_SERVER, "Local and server scores" },
- { NULL, NULL },
+ { NULL, NULL },
};
static struct ValueTextInfo game_speeds_list_normal[] =
{
- { 30, "Very Slow" },
- { 25, "Slow" },
- { 20, "Normal" },
- { 15, "Fast" },
- { 10, "Very Fast" },
+ { 30, "Very Slow" },
+ { 25, "Slow" },
+ { 20, "Normal" },
+ { 15, "Fast" },
+ { 10, "Very Fast" },
- { -1, NULL },
+ { -1, NULL },
};
static struct ValueTextInfo game_speeds_list_extended[] =
{
- { 1000, "1 fps (Extremely Slow)" },
- { 500, "2 fps" },
- { 200, "5 fps" },
- { 100, "10 fps" },
- { 50, "20 fps" },
- { 29, "35 fps (Original Supaplex)" },
- { 25, "40 fps" },
- { 20, "50 fps (=== Normal Speed ===)" },
- { 16, "60 fps (60 Hz VSync Speed)" },
- { 14, "70 fps (Maximum Supaplex)" },
- { 10, "100 fps" },
- { 5, "200 fps" },
- { 2, "500 fps" },
- { 1, "1000 fps (Extremely Fast)" },
-
- { -1, NULL },
+ { 1000, "1 fps (Extremely Slow)" },
+ { 500, "2 fps" },
+ { 200, "5 fps" },
+ { 100, "10 fps" },
+ { 50, "20 fps" },
+ { 29, "35 fps (Original Supaplex)" },
+ { 25, "40 fps" },
+ { 20, "50 fps (=== Normal Speed ===)" },
+ { 16, "60 fps (60 Hz VSync Speed)" },
+ { 14, "70 fps (Maximum Supaplex)" },
+ { 10, "100 fps" },
+ { 5, "200 fps" },
+ { 2, "500 fps" },
+ { 1, "1000 fps (Extremely Fast)" },
+
+ { -1, NULL },
};
static struct ValueTextInfo *game_speeds_list;
static struct ValueTextInfo scroll_delays_list[] =
{
- { 0, "0 Tiles (No Scroll Delay)" },
- { 1, "1 Tile" },
- { 2, "2 Tiles" },
- { 3, "3 Tiles (Default)" },
- { 4, "4 Tiles" },
- { 5, "5 Tiles" },
- { 6, "6 Tiles" },
- { 7, "7 Tiles" },
- { 8, "8 Tiles (Maximum Scroll Delay)"},
-
- { -1, NULL },
+ { 0, "0 Tiles (No Scroll Delay)" },
+ { 1, "1 Tile" },
+ { 2, "2 Tiles" },
+ { 3, "3 Tiles (Default)" },
+ { 4, "4 Tiles" },
+ { 5, "5 Tiles" },
+ { 6, "6 Tiles" },
+ { 7, "7 Tiles" },
+ { 8, "8 Tiles (Maximum Scroll Delay)"},
+
+ { -1, NULL },
};
static struct StringValueTextInfo snapshot_modes_list[] =
{
- { STR_SNAPSHOT_MODE_OFF, "Off" },
- { STR_SNAPSHOT_MODE_EVERY_STEP, "Every Step" },
- { STR_SNAPSHOT_MODE_EVERY_MOVE, "Every Move" },
- { STR_SNAPSHOT_MODE_EVERY_COLLECT, "Every Collect" },
+ { STR_SNAPSHOT_MODE_OFF, "Off" },
+ { STR_SNAPSHOT_MODE_EVERY_STEP, "Every Step" },
+ { STR_SNAPSHOT_MODE_EVERY_MOVE, "Every Move" },
+ { STR_SNAPSHOT_MODE_EVERY_COLLECT, "Every Collect" },
+
+ { 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" },
- { NULL, NULL },
+ { -1, NULL }
+};
+
+static struct ValueTextInfo bd_palettes_c64_list[] =
+{
+ { GD_PALETTE_C64_VICE_NEW, "Vice new" },
+ { GD_PALETTE_C64_VICE_OLD, "Vice old" },
+ { GD_PALETTE_C64_VIDE_DEFAULT, "Vice default" },
+ { GD_PALETTE_C64_C64HQ, "C64HQ" },
+ { GD_PALETTE_C64_C64S, "C64S" },
+ { GD_PALETTE_C64_CCS64, "CCS64" },
+ { GD_PALETTE_C64_FRODO, "Frodo" },
+ { GD_PALETTE_C64_GODOT, "GoDot" },
+ { GD_PALETTE_C64_PC64, "PC64" },
+ { GD_PALETTE_C64_RTADASH, "RTADash" },
+
+ { -1, NULL },
+};
+
+static struct ValueTextInfo bd_palettes_c64dtv_list[] =
+{
+ { GD_PALETTE_C64DTV_SPIFF, "Spiff" },
+ { GD_PALETTE_C64DTV_MURRAY, "Murray" },
+
+ { -1, NULL },
+};
+
+static struct ValueTextInfo bd_palettes_atari_list[] =
+{
+ { GD_PALETTE_ATARI_BUILTIN, "BuiltIn" },
+ { GD_PALETTE_ATARI_BUILTIN_CONTRAST, "BuiltIn contrast" },
+ { GD_PALETTE_ATARI_DEFAULT, "Default" },
+ { GD_PALETTE_ATARI_JAKUB, "Jakub" },
+ { GD_PALETTE_ATARI_JAKUB_CONTRAST, "Jakub contrast" },
+ { GD_PALETTE_ATARI_REAL, "Real" },
+ { GD_PALETTE_ATARI_REAL_CONTRAST, "Real contrast" },
+ { GD_PALETTE_ATARI_XFORMER, "XFormer" },
+
+ { -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 %" },
- { 1, "1 %" },
- { 2, "2 %" },
- { 5, "5 %" },
- { 10, "10 %" },
- { 20, "20 %" },
- { 30, "30 %" },
- { 40, "40 %" },
- { 50, "50 %" },
- { 60, "60 %" },
- { 70, "70 %" },
- { 80, "80 %" },
- { 90, "90 %" },
- { 100, "100 %" },
-
- { -1, NULL },
+ { 0, "0 %" },
+ { 1, "1 %" },
+ { 2, "2 %" },
+ { 5, "5 %" },
+ { 10, "10 %" },
+ { 20, "20 %" },
+ { 30, "30 %" },
+ { 40, "40 %" },
+ { 50, "50 %" },
+ { 60, "60 %" },
+ { 70, "70 %" },
+ { 80, "80 %" },
+ { 90, "90 %" },
+ { 100, "100 %" },
+
+ { -1, NULL },
};
static struct StringValueTextInfo touch_controls_list[] =
{
- { TOUCH_CONTROL_OFF, "Off" },
- { TOUCH_CONTROL_VIRTUAL_BUTTONS, "Virtual Buttons" },
- { TOUCH_CONTROL_WIPE_GESTURES, "Wipe Gestures" },
- { TOUCH_CONTROL_FOLLOW_FINGER, "Follow Finger" },
+ { TOUCH_CONTROL_OFF, "Off" },
+ { TOUCH_CONTROL_VIRTUAL_BUTTONS, "Virtual Buttons" },
+ { TOUCH_CONTROL_WIPE_GESTURES, "Wipe Gestures" },
+ { TOUCH_CONTROL_FOLLOW_FINGER, "Follow Finger" },
- { NULL, NULL },
+ { NULL, NULL },
};
static struct ValueTextInfo distances_list[] =
{
- { 1, "1 %" },
- { 2, "2 %" },
- { 3, "3 %" },
- { 4, "4 %" },
- { 5, "5 %" },
- { 10, "10 %" },
- { 15, "15 %" },
- { 20, "20 %" },
- { 25, "25 %" },
-
- { -1, NULL },
+ { 1, "1 %" },
+ { 2, "2 %" },
+ { 3, "3 %" },
+ { 4, "4 %" },
+ { 5, "5 %" },
+ { 10, "10 %" },
+ { 15, "15 %" },
+ { 20, "20 %" },
+ { 25, "25 %" },
+
+ { -1, NULL },
};
static struct ValueTextInfo transparencies_list[] =
{
- { 0, "0 % (Opaque)" },
- { 10, "10 %" },
- { 20, "20 %" },
- { 30, "30 %" },
- { 40, "40 %" },
- { 50, "50 %" },
- { 60, "60 %" },
- { 70, "70 %" },
- { 80, "80 %" },
- { 90, "90 %" },
- { 100, "100 % (Invisible)" },
-
- { -1, NULL },
+ { 0, "0 % (Opaque)" },
+ { 10, "10 %" },
+ { 20, "20 %" },
+ { 30, "30 %" },
+ { 40, "40 %" },
+ { 50, "50 %" },
+ { 60, "60 %" },
+ { 70, "70 %" },
+ { 80, "80 %" },
+ { 90, "90 %" },
+ { 100, "100 % (Invisible)" },
+
+ { -1, NULL },
};
static struct ValueTextInfo grid_sizes_list[] =
{
- { 3, "3" },
- { 4, "4" },
- { 5, "5" },
- { 6, "6" },
- { 7, "7" },
- { 8, "8" },
- { 9, "9" },
- { 10, "10" },
- { 11, "11" },
- { 12, "12" },
- { 13, "13" },
- { 14, "14" },
- { 15, "15" },
- { 16, "16" },
- { 17, "17" },
- { 18, "18" },
- { 19, "19" },
- { 20, "20" },
- { 21, "21" },
- { 22, "22" },
- { 23, "23" },
- { 24, "24" },
- { 25, "25" },
- { 26, "26" },
- { 27, "27" },
- { 28, "28" },
- { 29, "29" },
- { 30, "30" },
- { 31, "31" },
- { 32, "32" },
-
- { -1, NULL },
+ { 3, "3" },
+ { 4, "4" },
+ { 5, "5" },
+ { 6, "6" },
+ { 7, "7" },
+ { 8, "8" },
+ { 9, "9" },
+ { 10, "10" },
+ { 11, "11" },
+ { 12, "12" },
+ { 13, "13" },
+ { 14, "14" },
+ { 15, "15" },
+ { 16, "16" },
+ { 17, "17" },
+ { 18, "18" },
+ { 19, "19" },
+ { 20, "20" },
+ { 21, "21" },
+ { 22, "22" },
+ { 23, "23" },
+ { 24, "24" },
+ { 25, "25" },
+ { 26, "26" },
+ { 27, "27" },
+ { 28, "28" },
+ { 29, "29" },
+ { 30, "30" },
+ { 31, "31" },
+ { 32, "32" },
+
+ { -1, NULL },
};
static int align_xoffset = 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 : \
return compare_result;
}
+static boolean CheckTitleScreen_BD(int nr, boolean initial)
+{
+ // only show BD style title screen for native BD level sets
+ if (level.game_engine_type != GAME_ENGINE_TYPE_BD)
+ return FALSE;
+
+ // only show BD style title screen for first title screen of a level set
+ if (initial || nr != 0)
+ return FALSE;
+
+ int graphic = getTitleScreenGraphic(nr, initial);
+ Bitmap *bitmap = graphic_info[graphic].bitmap;
+
+ // only show BD style title screen if no other title screen defined
+ if (bitmap != NULL)
+ return FALSE;
+
+ // check if BD style title screen defined
+ return (GetTitleScreenBitmaps_BD() != NULL);
+}
+
static void InitializeTitleControlsExt_AddTitleInfo(boolean is_image,
boolean initial,
int nr, int sort_priority)
int graphic = getTitleScreenGraphic(i, initial);
Bitmap *bitmap = graphic_info[graphic].bitmap;
int sort_priority = graphic_info[graphic].sort_priority;
+ boolean has_title_screen = (bitmap != NULL);
- if (bitmap != NULL)
+ // check for optional title screen of native BD style level set
+ if (CheckTitleScreen_BD(i, initial))
+ has_title_screen = TRUE;
+
+ if (has_title_screen)
InitializeTitleControlsExt_AddTitleInfo(TRUE, initial, i, sort_priority);
}
static void DrawTitleScreenImage(int nr, boolean initial)
{
+ static int frame_counter = 0;
int graphic = getTitleScreenGraphic(nr, initial);
Bitmap *bitmap = graphic_info[graphic].bitmap;
+ Bitmap *bitmap_background = NULL;
int draw_masked = graphic_info[graphic].draw_masked;
int width = graphic_info[graphic].width;
int height = graphic_info[graphic].height;
int src_y = graphic_info[graphic].src_y;
int dst_x, dst_y;
+ // check for optional title screen of native BD style level set
+ if (CheckTitleScreen_BD(nr, initial))
+ {
+ Bitmap **title_screen_bitmaps = GetTitleScreenBitmaps_BD();
+
+ bitmap = title_screen_bitmaps[0];
+ bitmap_background = title_screen_bitmaps[1];
+
+ if (bitmap != NULL)
+ {
+ width = bitmap->width;
+ height = bitmap->height;
+ src_x = 0;
+ src_y = 0;
+ }
+ }
+
if (bitmap == NULL)
return;
ClearRectangleOnBackground(drawto, 0, 0, WIN_XSIZE, WIN_YSIZE);
- if (DrawingOnBackground(dst_x, dst_y) && draw_masked)
+ boolean draw_masked_final = (DrawingOnBackground(dst_x, dst_y) && draw_masked);
+
+ if (bitmap_background != NULL)
+ {
+ int size = bitmap_background->height - bitmap->height;
+ int offset = frame_counter++ % size;
+
+ BlitBitmap(bitmap_background, drawto, src_x, src_y + offset, width, height, dst_x, dst_y);
+
+ draw_masked_final = TRUE;
+ }
+
+ if (draw_masked_final)
BlitBitmapMasked(bitmap, drawto, src_x, src_y, width, height, dst_x, dst_y);
else
BlitBitmap(bitmap, drawto, src_x, src_y, width, height, dst_x, dst_y);
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);
return_to_main_menu = TRUE;
}
}
+ else
+ {
+ tci = &title_controls[title_screen_nr];
+
+ // check for optional title screen of native BD style level set
+ if (tci->is_image && CheckTitleScreen_BD(tci->local_nr, tci->initial))
+ {
+ Bitmap **title_screen_bitmaps = GetTitleScreenBitmaps_BD();
+
+ // if title screen is animated, draw title screen animation
+ if (title_screen_bitmaps[0] != NULL &&
+ title_screen_bitmaps[1] != NULL)
+ DrawTitleScreenImage(tci->local_nr, tci->initial);
+ }
+ }
if (return_to_main_menu)
{
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;
}
char *pos_text = getHallOfFameRankText(pos, 3);
int i;
+ // highlight all high score entries of the current player
+ if (strEqual(scores.entry[pos].name, setup.player_name))
+ font_nr2 = FONT_TEXT_2_ACTIVE;
+
DrawText(startx1, starty, pos_text, font_nr1);
for (i = 0; i < num_dots; i++)
setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY ||
setup_mode == SETUP_MODE_CHOOSE_SNAPSHOT_MODE)
execSetupGame();
+ 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_COLOR_TYPE)
+ execSetupEngines();
else if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE ||
setup_mode == SETUP_MODE_CHOOSE_SCALING_TYPE ||
setup_mode == SETUP_MODE_CHOOSE_RENDERING ||
return;
}
+ else if (game_status == GAME_MODE_NAMES && dx == 1)
+ {
+ SetGameStatus(GAME_MODE_PSEUDO_TYPENAMES);
+
+ DrawTypeName();
+
+ return;
+ }
else if (dx == 1)
{
TreeInfo *node_first, *node_cursor;
setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY ||
setup_mode == SETUP_MODE_CHOOSE_SNAPSHOT_MODE)
execSetupGame();
+ 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_COLOR_TYPE)
+ execSetupEngines();
else if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE ||
setup_mode == SETUP_MODE_CHOOSE_SCALING_TYPE ||
setup_mode == SETUP_MODE_CHOOSE_RENDERING ||
setup_mode == SETUP_MODE_CHOOSE_SCROLL_DELAY ||
setup_mode == SETUP_MODE_CHOOSE_SNAPSHOT_MODE)
execSetupGame();
+ 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_COLOR_TYPE)
+ execSetupEngines();
else if (setup_mode == SETUP_MODE_CHOOSE_WINDOW_SIZE ||
setup_mode == SETUP_MODE_CHOOSE_SCALING_TYPE ||
setup_mode == SETUP_MODE_CHOOSE_RENDERING ||
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)
+ {
+ int i;
+
+ for (i = 0; bd_palettes_c64_list[i].value != -1; i++)
+ {
+ TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
+ char identifier[32], name[32];
+ int value = bd_palettes_c64_list[i].value;
+ char *text = bd_palettes_c64_list[i].text;
+
+ ti->node_top = &bd_palettes_c64;
+ 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_PALETTE_C64);
+
+ pushTreeInfo(&bd_palettes_c64, ti);
+ }
+
+ // sort palette values to start with lowest palette value
+ sortTreeInfo(&bd_palettes_c64);
+
+ // set current palette value to configured palette value
+ bd_palette_c64_current =
+ getTreeInfoFromIdentifier(bd_palettes_c64, i_to_a(setup.bd_palette_c64));
+
+ // if that fails, set current palette to reliable default value
+ if (bd_palette_c64_current == NULL)
+ bd_palette_c64_current =
+ getTreeInfoFromIdentifier(bd_palettes_c64, i_to_a(GD_DEFAULT_PALETTE_C64));
+
+ // if that also fails, set current palette to first available value
+ if (bd_palette_c64_current == NULL)
+ bd_palette_c64_current = bd_palettes_c64;
+ }
+
+ setup.bd_palette_c64 = atoi(bd_palette_c64_current->identifier);
+
+ // needed for displaying palette text instead of identifier
+ bd_palette_c64_text = bd_palette_c64_current->name;
+}
+
+static void execSetupEngines_setPalettesC64DTV(void)
+{
+ if (bd_palettes_c64dtv == NULL)
+ {
+ int i;
+
+ for (i = 0; bd_palettes_c64dtv_list[i].value != -1; i++)
+ {
+ TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
+ char identifier[32], name[32];
+ int value = bd_palettes_c64dtv_list[i].value;
+ char *text = bd_palettes_c64dtv_list[i].text;
+
+ ti->node_top = &bd_palettes_c64dtv;
+ 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_PALETTE_C64DTV);
+
+ pushTreeInfo(&bd_palettes_c64dtv, ti);
+ }
+
+ // sort palette values to start with lowest palette value
+ sortTreeInfo(&bd_palettes_c64dtv);
+
+ // set current palette value to configured palette value
+ bd_palette_c64dtv_current =
+ getTreeInfoFromIdentifier(bd_palettes_c64dtv, i_to_a(setup.bd_palette_c64dtv));
+
+ // if that fails, set current palette to reliable default value
+ if (bd_palette_c64dtv_current == NULL)
+ bd_palette_c64dtv_current =
+ getTreeInfoFromIdentifier(bd_palettes_c64dtv, i_to_a(GD_DEFAULT_PALETTE_C64DTV));
+
+ // if that also fails, set current palette to first available value
+ if (bd_palette_c64dtv_current == NULL)
+ bd_palette_c64dtv_current = bd_palettes_c64dtv;
+ }
+
+ setup.bd_palette_c64dtv = atoi(bd_palette_c64dtv_current->identifier);
+
+ // needed for displaying palette text instead of identifier
+ bd_palette_c64dtv_text = bd_palette_c64dtv_current->name;
+}
+
+static void execSetupEngines_setPalettesAtari(void)
+{
+ if (bd_palettes_atari == NULL)
+ {
+ int i;
+
+ for (i = 0; bd_palettes_atari_list[i].value != -1; i++)
+ {
+ TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_UNDEFINED);
+ char identifier[32], name[32];
+ int value = bd_palettes_atari_list[i].value;
+ char *text = bd_palettes_atari_list[i].text;
+
+ ti->node_top = &bd_palettes_atari;
+ 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_PALETTE_ATARI);
+
+ pushTreeInfo(&bd_palettes_atari, ti);
+ }
+
+ // sort palette values to start with lowest palette value
+ sortTreeInfo(&bd_palettes_atari);
+
+ // set current palette value to configured palette value
+ bd_palette_atari_current =
+ getTreeInfoFromIdentifier(bd_palettes_atari, i_to_a(setup.bd_palette_atari));
+
+ // if that fails, set current palette to reliable default value
+ if (bd_palette_atari_current == NULL)
+ bd_palette_atari_current =
+ getTreeInfoFromIdentifier(bd_palettes_atari, i_to_a(GD_DEFAULT_PALETTE_ATARI));
+
+ // if that also fails, set current palette to first available value
+ if (bd_palette_atari_current == NULL)
+ bd_palette_atari_current = bd_palettes_atari;
+ }
+
+ setup.bd_palette_atari = atoi(bd_palette_atari_current->identifier);
+
+ // needed for displaying palette text instead of identifier
+ 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();
+}
+
+static void execSetupChoosePaletteC64(void)
+{
+ setup_mode = SETUP_MODE_CHOOSE_BD_PALETTE_C64;
+
+ DrawSetupScreen();
+}
+
+static void execSetupChoosePaletteC64DTV(void)
+{
+ setup_mode = SETUP_MODE_CHOOSE_BD_PALETTE_C64DTV;
+
+ DrawSetupScreen();
+}
+
+static void execSetupChoosePaletteAtari(void)
+{
+ setup_mode = SETUP_MODE_CHOOSE_BD_PALETTE_ATARI;
+
+ DrawSetupScreen();
+}
+
+static void execSetupChooseColorType(void)
+{
+ setup_mode = SETUP_MODE_CHOOSE_BD_COLOR_TYPE;
+
DrawSetupScreen();
}
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
struct TokenInfo *si = &setup_info[si_pos];
boolean font_draw_xoffset_modified = FALSE;
boolean scrollbar_needed = (num_setup_info < max_setup_info);
+ int mx_scrollbar = screen_gadget[SCREEN_CTRL_ID_SCROLL_VERTICAL]->x;
+ int mx_right_border = (scrollbar_needed ? mx_scrollbar : SX + SXSIZE);
int font_draw_xoffset_old = -1;
- int xoffset = (scrollbar_needed ? -1 : 0);
+ int xoffset = (scrollbar_needed ? 0 : 1);
int menu_screen_value_xpos = MENU_SCREEN_VALUE_XPOS + xoffset;
- int menu_screen_max_xpos = MENU_SCREEN_MAX_XPOS + xoffset;
int xpos = menu_screen_value_xpos;
int ypos = MENU_SCREEN_START_YPOS + screen_pos;
int startx = mSX + xpos * 32;
int font_nr_default = getSetupValueFont(type, value);
int font_width_default = getFontWidth(font_nr_default);
int font_nr = font_nr_default;
- int i;
if (value_string == NULL)
return;
if (strlen(value_string) > max_value_len)
value_string[max_value_len] = '\0';
}
- else if (type & TYPE_YES_NO_AUTO)
- {
- xpos = menu_screen_value_xpos - 1;
- }
else if (type & TYPE_PLAYER)
{
int displayed_player_nr = *(int *)value + 1;
startx = mSX + xpos * 32;
starty = mSY + ypos * 32;
- // special check if right-side setup values moved left due to scrollbar
- if (scrollbar_needed && xpos > MENU_SCREEN_START_XPOS)
- {
- int max_menu_text_length = 26; // maximum text length for classic menu
- int font_xoffset = getFontDrawOffsetX(font_nr);
- int text_startx = mSX + MENU_SCREEN_START_XPOS * 32;
- int text_font_nr = getMenuTextFont(FONT_MENU_2);
- int text_font_xoffset = getFontDrawOffsetX(text_font_nr);
- int text_width = max_menu_text_length * getFontWidth(text_font_nr);
-
- if (startx + font_xoffset < text_startx + text_width + text_font_xoffset)
- {
- // when using narrow font, left-shifting text "auto" not needed
- if (type & TYPE_YES_NO_AUTO)
- xpos += 1;
-
- xpos += 1;
- startx = mSX + xpos * 32;
-
- font_nr = getSetupValueFontNarrow(type, font_nr);
- }
- }
+ // always use narrow font for setup values on right screen side
+ if (xpos > MENU_SCREEN_START_XPOS)
+ font_nr = getSetupValueFontNarrow(type, font_nr);
// downward compatibility correction for Juergen Bonhagen's menu settings
if (setup_mode != SETUP_MODE_INPUT)
}
}
- for (i = 0; i <= menu_screen_max_xpos - xpos; i++)
- DrawText(startx + i * font_width_default, starty, " ", font_nr_default);
-
+ DrawBackground(startx, starty, mx_right_border - startx, getFontHeight(font_nr));
DrawText(startx, starty, value_string, font_nr);
if (type & TYPE_PLAYER)
{
*(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,
void HandleScreenGadgetKeys(Key key)
{
- if (key == setup.shortcut.tape_play)
+ if (key == setup.shortcut.tape_play || key == KSYM_Return)
HandleScreenGadgets(screen_gadget[SCREEN_CTRL_ID_PLAY_TAPE]);
}
projects / rocksndiamonds.git / blobdiff