X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=ee5035ce0320569f35a9fb27e510a0123da9636d;hb=6ca233d4d71331460af0443bf5b307f16c6fe069;hp=e2308b4d4e455a345f36f9442b7f92f88cb1bf8d;hpb=44307678912a3b7b5a3222b4929976b8e229546b;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index e2308b4d..ee5035ce 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -4339,12 +4339,23 @@ static int getAlignYOffsetFromTreeInfo(TreeInfo *ti)
   return align_yoffset;
 }
 
+static void StartPlayingFromHallOfFame(void)
+{
+  level_nr = scores.next_level_nr;
+  LoadLevel(level_nr);
+
+  StartGameActions(network.enabled, setup.autorecord, level.random_seed);
+}
+
 static void DrawChooseTree(TreeInfo **ti_ptr)
 {
   int fade_mask = REDRAW_FIELD;
   boolean restart_music = (game_status != game_status_last_screen &&
 			   game_status_last_screen != GAME_MODE_SCOREINFO);
 
+  scores.continue_on_return = (game_status == GAME_MODE_SCORES &&
+			       game_status_last_screen == GAME_MODE_PLAYING);
+
   if (CheckFadeAll())
     fade_mask = REDRAW_ALL;
 
@@ -4354,7 +4365,11 @@ static void DrawChooseTree(TreeInfo **ti_ptr)
     {
       execSetupArtwork();
     }
-    else	// GAME_MODE_LEVELS
+    else if (game_status == GAME_MODE_SCORES && scores.continue_playing)
+    {
+      StartPlayingFromHallOfFame();
+    }
+    else
     {
       SetGameStatus(GAME_MODE_MAIN);
 
@@ -4798,18 +4813,18 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
   }
 
 #if defined(PLATFORM_ANDROID)
-  // touching the screen anywhere continues playing the next level
-  if ((mx || my) && scores.continue_playing)
+  // directly continue when touching the screen after playing
+  if ((mx || my) && scores.continue_on_return)
   {
+    // ignore touch events until released
     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.continue_playing)
+  // any mouse click or cursor key stops leaving scores by "Return" key
+  if ((mx || my || dx || dy) && scores.continue_on_return)
   {
-    scores.continue_playing = FALSE;
+    scores.continue_on_return = FALSE;
     level_nr = scores.last_level_nr;
     LoadLevel(level_nr);
   }
@@ -4893,15 +4908,17 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 
       node_cursor->cl_first = ti->cl_first;
       node_cursor->cl_cursor = ti->cl_cursor;
+
       *ti_ptr = node_cursor->node_group;
       DrawChooseTree(ti_ptr);
 
       return;
     }
   }
-  else if (dx == -1 && ti->node_parent)
+  else if ((dx == -1 || button == MB_MENU_CONTINUE) && ti->node_parent)
   {
-    FadeSetLeaveMenu();
+    if (game_status != GAME_MODE_SCORES)
+      FadeSetLeaveMenu();
 
     PlaySound(SND_MENU_ITEM_SELECTING);
 
@@ -4984,6 +5001,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 
 	node_cursor->cl_first = ti->cl_first;
 	node_cursor->cl_cursor = ti->cl_cursor;
+
 	*ti_ptr = node_cursor->node_group;
 	DrawChooseTree(ti_ptr);
       }
@@ -5002,6 +5020,7 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 
 	node_cursor->cl_first = ti->cl_first;
 	node_cursor->cl_cursor = ti->cl_cursor;
+
 	*ti_ptr = node_cursor;
 
 	if (ti->type == TREE_TYPE_LEVEL_DIR)
@@ -5092,16 +5111,13 @@ static void HandleChooseTree(int mx, int my, int dx, int dy, int button,
 	  }
 	  else if (game_status == GAME_MODE_SCORES)
 	  {
-	    if (setup.auto_play_next_level && setup.increment_levels &&
-		scores.last_level_nr < leveldir_current->last_level &&
-		scores.continue_playing &&
-		!network_playing)
+	    if (scores.continue_playing && scores.continue_on_return)
 	    {
-	      StartGameActions(network.enabled, setup.autorecord,
-			       level.random_seed);
+	      StartPlayingFromHallOfFame();
+
 	      return;
 	    }
-	    else if (!scores.continue_playing)
+	    else if (!scores.continue_on_return)
 	    {
 	      SetGameStatus(GAME_MODE_SCOREINFO);
 
@@ -5298,6 +5314,9 @@ static void DrawHallOfFame_setScoreEntries(void)
   if (score_entry_current == NULL)
     score_entry_current = getFirstValidTreeInfoEntry(score_entries);
 
+  if (score_entries != NULL && scores.continue_playing)
+    setString(&score_entries->node_group->name, BACKLINK_TEXT_NEXT);
+
   // ("score_entries" and "score_entry_current" may be NULL here)
 }