X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=f578c05d233f24ac8454379b86bb18b66e79103f;hb=220eba293baab8856f29ca243c9d2d313806cab1;hp=4df8f4d97aca18b38c86cab769129e83a58fad8a;hpb=13cd07af3c2a9378b6a89506ba869502a871877d;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index 4df8f4d9..f578c05d 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -1458,6 +1458,11 @@ static void clearMenuListArea(void)
   // clear menu list area, but not title or scrollbar
   DrawBackground(mSX, mSY + MENU_SCREEN_START_YPOS * 32,
                  scrollbar_xpos - mSX, NUM_MENU_ENTRIES_ON_SCREEN * 32);
+
+  // special compatibility handling for "Snake Bite" graphics set
+  if (strPrefix(leveldir_current->identifier, "snake_bite"))
+    ClearRectangle(drawto, mSX, mSY + MENU_SCREEN_START_YPOS * 32,
+		   scrollbar_xpos - mSX, NUM_MENU_ENTRIES_ON_SCREEN * 32);
 }
 
 static void drawCursorExt(int xpos, int ypos, boolean active, int graphic)
@@ -4776,10 +4781,25 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
     return;
   }
 
-  if (mx || my)		// mouse input
+#if defined(PLATFORM_ANDROID)
+  // touching the screen anywhere continues playing the next level
+  if ((mx || my) && scores.was_just_playing)
+  {
+    mx = my = 0;
+    button = MB_MENU_CHOICE;
+  }
+#endif
+
+  // any mouse click or direction input stops playing the next level
+  if ((mx || my || dx || dy) && scores.was_just_playing)
   {
     scores.was_just_playing = FALSE;
+    level_nr = scores.last_level_nr;
+    LoadLevel(level_nr);
+  }
 
+  if (mx || my)		// mouse input
+  {
     x = (mx - amSX) / 32;
     y = (my - amSY) / 32 - MENU_SCREEN_START_YPOS;
 
@@ -4788,8 +4808,6 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
   }
   else if (dx || dy)	// keyboard or scrollbar/scrollbutton input
   {
-    scores.was_just_playing = FALSE;
-
     // move cursor instead of scrolling when already at start/end of list
     if (dy == -1 * SCROLL_LINE && ti->cl_first == 0)
       dy = -1;
@@ -5411,10 +5429,11 @@ static void DrawScoreInfo_Content(int entry_nr)
   int ystep_title = getMenuTextStep(spacing_title, font_title);
   int ystep_para  = getMenuTextStep(spacing_para,  font_text);
   int ystep_line  = getMenuTextStep(spacing_line,  font_text);
+  int xstart  = mSX - SX + menu.left_spacing[GAME_MODE_SCOREINFO];
   int ystart  = mSY - SY + menu.top_spacing[GAME_MODE_SCOREINFO];
   int ybottom = mSY - SY + SYSIZE - menu.bottom_spacing[GAME_MODE_SCOREINFO];
-  int xstart1 = mSX - SX + 2 * xstep;
-  int xstart2 = mSX - SX + 13 * xstep;
+  int xstart1 = xstart + xstep;
+  int xstart2 = xstart + xstep * 12;
   int select_x = SX + xstart1;
   int select_y1, select_y2;
   int play_x, play_y;
@@ -5424,14 +5443,14 @@ static void DrawScoreInfo_Content(int entry_nr)
   int font_height = getFontHeight(font_text);
   int tape_date_width  = getTextWidth(tape_date, font_text);
   int pad_left = xstart2;
-  int pad_right = MENU_SCREEN_INFO_SPACE_RIGHT;
+  int pad_right = menu.right_spacing[GAME_MODE_SCOREINFO];
   int max_chars_per_line = (SXSIZE - pad_left - pad_right) / font_width;
   int max_lines_per_text = 5;
   int lines;
 
   ClearField();
 
-  // redraw score selection buttons (which have just been erased)
+  // redraw level selection buttons (which have just been erased)
   RedrawScreenMenuGadgets(SCREEN_MASK_SCORES);
 
   if (score_entries == NULL)
@@ -5526,15 +5545,29 @@ static void DrawScoreInfo(int entry_nr)
   scores.last_entry_nr = entry_nr;
   score_info_tape_play = FALSE;
 
-  SetMainBackgroundImageIfDefined(IMG_BACKGROUND_SCOREINFO);
-
   UnmapAllGadgets();
 
+  FreeScreenGadgets();
+  CreateScreenGadgets();
+
   FadeOut(REDRAW_FIELD);
 
   // needed if different viewport properties defined after playing score tape
   ChangeViewportPropertiesIfNeeded();
 
+  // set this after "ChangeViewportPropertiesIfNeeded()" (which may reset it)
+  SetDrawDeactivationMask(REDRAW_NONE);
+  SetDrawBackgroundMask(REDRAW_FIELD);
+
+  // needed if different background image defined after playing score tape
+  SetMainBackgroundImage(IMG_BACKGROUND_SCORES);
+  SetMainBackgroundImageIfDefined(IMG_BACKGROUND_SCOREINFO);
+
+  // special compatibility handling for "Snake Bite" graphics set
+  if (strPrefix(leveldir_current->identifier, "snake_bite"))
+    ClearRectangle(gfx.background_bitmap, gfx.real_sx, gfx.real_sy + 64,
+		   gfx.full_sxsize, gfx.full_sysize - 64);
+
   DrawScoreInfo_Content(entry_nr);
 
   // map gadgets for score info screen
@@ -9716,12 +9749,18 @@ static void CreateScreenMenubuttons(void)
       // if x/y set to -1, dynamically place buttons next to title text
       int title_width = getTextWidth(INFOTEXT_SCORE_ENTRY, FONT_TITLE_1);
 
+      // special compatibility handling for "Snake Bite" graphics set
+      if (strPrefix(leveldir_current->identifier, "snake_bite"))
+	title_width = strlen(INFOTEXT_SCORE_ENTRY) * 32;
+
+      // use "SX" here to center buttons (ignore horizontal draw offset)
       if (pos->x == -1)
 	x = (id == SCREEN_CTRL_ID_PREV_LEVEL2 ?
 	     SX + (SXSIZE - title_width) / 2 - width * 3 / 2 :
 	     id == SCREEN_CTRL_ID_NEXT_LEVEL2 ?
 	     SX + (SXSIZE + title_width) / 2 + width / 2 : 0);
 
+      // use "mSY" here to place buttons (respect vertical draw offset)
       if (pos->y == -1)
 	y = (id == SCREEN_CTRL_ID_PREV_LEVEL2 ||
 	     id == SCREEN_CTRL_ID_NEXT_LEVEL2 ? mSY + MENU_TITLE1_YPOS : 0);
@@ -10230,6 +10269,12 @@ static void HandleScreenGadgets(struct GadgetInfo *gi)
   }
 }
 
+void HandleScreenGadgetKeys(Key key)
+{
+  if (key == setup.shortcut.tape_play)
+    HandleScreenGadgets(screen_gadget[SCREEN_CTRL_ID_PLAY_TAPE]);
+}
+
 void DumpScreenIdentifiers(void)
 {
   int i;