X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fscreens.c;h=a63aa3339f8d3ec1d70c7d3cd2cab0b0f5432d9d;hb=b1e5dbd359426dae2beaed44b1b6cc3c2b4b2d02;hp=4fb4e148fbdc2e54621aeb3045d23f35defbe255;hpb=fdb8c9a6ae3d2ed960506a57ddca1bafc55a67ea;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index 4fb4e148..a63aa333 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -1957,6 +1957,16 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button)
   }
 }
 
+static void HandleMainMenu_ToggleTeamMode(void)
+{
+  setup.team_mode = !setup.team_mode;
+
+  InitializeMainControls();
+  DrawCursorAndText_Main(MAIN_CONTROL_NAME, TRUE, FALSE);
+
+  DrawPreviewPlayers();
+}
+
 static void HandleMainMenu_SelectLevel(int step, int direction,
 				       int selected_level_nr)
 {
@@ -2106,9 +2116,16 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       }
       else if (dx != 0)
       {
-	if (choice != MAIN_CONTROL_INFO &&
-	    choice != MAIN_CONTROL_SETUP)
+	if (choice == MAIN_CONTROL_NAME)
+	{
+	  // special case: cursor left or right pressed -- toggle team mode
+	  HandleMainMenu_ToggleTeamMode();
+	}
+	else if (choice != MAIN_CONTROL_INFO &&
+		 choice != MAIN_CONTROL_SETUP)
+	{
 	  HandleMainMenu_SelectLevel(1, dx, NO_DIRECT_LEVEL_SELECT);
+	}
       }
     }
     else
@@ -2121,12 +2138,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 	    insideTextPosRect(main_controls[i].pos_text, mx - mSX, my - mSY))
 	{
 	  // special case: menu text "name/team" clicked -- toggle team mode
-	  setup.team_mode = !setup.team_mode;
-
-	  InitializeMainControls();
-	  DrawCursorAndText_Main(choice, TRUE, FALSE);
-
-	  DrawPreviewPlayers();
+	  HandleMainMenu_ToggleTeamMode();
 	}
 	else
 	{
@@ -5117,6 +5129,7 @@ static void drawHallOfFameList(int level_nr, int first_entry)
   {
     int entry = first_entry + i;
     boolean active = (entry == scores.last_added);
+    boolean forced = (scores.force_last_added && active);
     int font_nr1 = (active ? FONT_TEXT_1_ACTIVE : FONT_TEXT_1);
     int font_nr2 = (active ? FONT_TEXT_2_ACTIVE : FONT_TEXT_2);
     int font_nr3 = (active ? FONT_TEXT_3_ACTIVE : FONT_TEXT_3);
@@ -5127,8 +5140,9 @@ static void drawHallOfFameList(int level_nr, int first_entry)
     int dx3 = SXSIZE - 2 * (mSX - SX + dxoff) - 5 * getFontWidth(font_nr4);
     int num_dots = (dx3 - dx2) / getFontWidth(font_nr3);
     int sy = mSY + 64 + i * 32;
+    char *pos_text = (forced ? "???" : int2str(entry + 1, 3));
 
-    DrawText(mSX, sy, int2str(entry + 1, 3), font_nr1);
+    DrawText(mSX, sy, pos_text, font_nr1);
     DrawText(mSX + dx1, sy, ".", font_nr1);
 
     for (j = 0; j < num_dots; j++)
@@ -6756,6 +6770,8 @@ static struct TokenInfo setup_info_game[] =
   { TYPE_PLAYER,	&setup.network_player_nr,"Preferred Network Player:" },
   { TYPE_TEXT_INPUT,	execGadgetNetworkServer, "Network Server Hostname:" },
   { TYPE_STRING,	&network_server_text,	""			},
+  { TYPE_SWITCH,	&setup.api_server,	"Use Highscore Server:"	},
+  { TYPE_SWITCH,	&setup.only_show_local_scores, "Only Show Local Scores:" },
   { 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:"		},
@@ -7357,6 +7373,10 @@ static void changeSetupValue(int screen_pos, int setup_info_pos_raw, int dx)
   if (si->value == &setup.network_mode)
     ToggleNetworkModeIfNeeded();
 
+  // API server mode may have changed at this point
+  if (si->value == &setup.api_server)
+    runtime.api_server = setup.api_server;
+
   // game speed list may have changed at this point
   if (si->value == &setup.game_speed_extended)
     ToggleGameSpeedsListIfNeeded();