X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=7cc586bc9cb90cf1d80c253def97e0d0171938e9;hb=f07da7d1b75d43c48bc4c6c4ac698ef119c245f7;hp=29e4f3cb7fe53435d4a88343eb94dca0d3b7717d;hpb=b6b5d3fe94b178e8e48e9c51b61f3b1b8383a42f;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index 29e4f3cb..7cc586bc 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -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]);
 }