X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fscreens.c;h=4a3619484444b0705bfb100ab2dc812cd9c2b39f;hb=75d67afa120f407fd37d299f947c00ea9f6e83ab;hp=29e4f3cb7fe53435d4a88343eb94dca0d3b7717d;hpb=b6b5d3fe94b178e8e48e9c51b61f3b1b8383a42f;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index 29e4f3cb..4a361948 100644 --- a/src/screens.c +++ b/src/screens.c @@ -410,216 +410,216 @@ static TreeInfo *score_entry_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 }, + { NULL, 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; @@ -1119,6 +1119,27 @@ static int compareTitleControlInfo(const void *object1, const void *object2) 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) @@ -1145,8 +1166,8 @@ static void InitializeTitleControls_CheckTitleInfo(boolean initial) boolean has_title_screen = (bitmap != NULL); // check for optional title screen of native BD style level set - if (!has_title_screen && level.game_engine_type == GAME_ENGINE_TYPE_BD && !initial && i == 0) - has_title_screen = (GetTitleScreen_BD() != NULL); + if (CheckTitleScreen_BD(i, initial)) + has_title_screen = TRUE; if (has_title_screen) InitializeTitleControlsExt_AddTitleInfo(TRUE, initial, i, sort_priority); @@ -1601,8 +1622,10 @@ static void DrawInfoScreen_Headline(int screen_nr, int num_screens, 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; @@ -1611,9 +1634,12 @@ static void DrawTitleScreenImage(int nr, boolean initial) int dst_x, dst_y; // check for optional title screen of native BD style level set - if (bitmap == NULL && level.game_engine_type == GAME_ENGINE_TYPE_BD && !initial && nr == 0) + if (CheckTitleScreen_BD(nr, initial)) { - bitmap = GetTitleScreen_BD(); + Bitmap **title_screen_bitmaps = GetTitleScreenBitmaps_BD(); + + bitmap = title_screen_bitmaps[0]; + bitmap_background = title_screen_bitmaps[1]; if (bitmap != NULL) { @@ -1650,7 +1676,19 @@ static void DrawTitleScreenImage(int nr, boolean initial) 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); @@ -2096,6 +2134,21 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) 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) { @@ -4668,6 +4721,10 @@ static void drawChooseTreeText(TreeInfo *ti, int y, boolean active) 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++) @@ -5031,6 +5088,14 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button, 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; @@ -10494,7 +10559,7 @@ static void HandleScreenGadgets(struct GadgetInfo *gi) 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]); }