X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fscreens.c;h=d596e2674eaa13c9ce9265d0b6562b4b04cc9b51;hp=29ce84dc807dc78761e1542d66965c41cfddf803;hb=bc84d4e4ec1babe815cb9e5b07168afa232bffb5;hpb=aec11dbcce774ba19a85bcc98a244890fb11ecde

diff --git a/src/screens.c b/src/screens.c
index 29ce84dc..d596e267 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -2168,8 +2168,8 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       else if (pos == MAIN_CONTROL_EDITOR)
       {
 	if (leveldir_current->readonly &&
-	    !strEqual(setup.player_name, "Artsoft"))
-	  Request("This level is read only!", REQ_CONFIRM);
+	    setup.editor.show_read_only_warning)
+	  Request("This level is read-only!", REQ_CONFIRM);
 
 	CloseDoor(DOOR_CLOSE_2);
 
@@ -4258,15 +4258,13 @@ static void HandleTypeNameExt(boolean initialize, Key key)
 
     name[xpos] = 0;
   }
-  else if (key == KSYM_Return)
+  else if (key == KSYM_Return || key == KSYM_Escape)
   {
-    setTypeNameValues(name, pos, TRUE);
+    boolean changed = (key == KSYM_Return);
 
-    active = FALSE;
-  }
-  else if (key == KSYM_Escape)
-  {
-    setTypeNameValues(name, pos, FALSE);
+    StopTextInput();
+
+    setTypeNameValues(name, pos, changed);
 
     active = FALSE;
   }
@@ -4275,8 +4273,6 @@ static void HandleTypeNameExt(boolean initialize, Key key)
 
   if (!active)
   {
-    StopTextInput();
-
     SetGameStatus(game_status_last_screen);
 
     if (game_status == GAME_MODE_MAIN)
@@ -4879,9 +4875,7 @@ void DrawChoosePlayerName(void)
 
   for (i = 0; i < MAX_PLAYER_NAMES; i++)
   {
-    boolean team_mode = (!network.enabled && setup.team_mode);
-    int tree_type = (team_mode ? TREE_TYPE_PLAYER_TEAM : TREE_TYPE_PLAYER_NAME);
-    TreeInfo *ti = newTreeInfo_setDefaults(tree_type);
+    TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_PLAYER_NAME);
     char identifier[32], name[MAX_PLAYER_NAME_LEN + 1];
     int value = i;
 
@@ -6696,6 +6690,7 @@ static struct TokenInfo setup_info_engines[] =
   { TYPE_SWITCH,	&setup.forced_scroll_delay, "Scroll Delay:"	},
   { TYPE_ECS_AGA,	&setup.prefer_aga_graphics, "Amiga Graphics Chipset:" },
   { TYPE_SWITCH,	&setup.prefer_lowpass_sounds,"Low-Pass Filter Sounds:" },
+  { TYPE_SWITCH,	&setup.prefer_extra_panel_items,"Show Dynamite and Keys:" },
   { TYPE_EMPTY,		NULL,			""			},
   { TYPE_HEADLINE,	NULL,			"Supaplex"		},
   { TYPE_SWITCH,	&setup.sp_show_border_elements, "Border Elements:" },
@@ -6734,6 +6729,8 @@ static struct TokenInfo setup_info_editor[] =
 #endif
   { TYPE_SWITCH, &setup.editor.show_element_token,	"Show element token:" },
   { TYPE_EMPTY,		NULL,			""			},
+  { TYPE_SWITCH, &setup.editor.show_read_only_warning,	"Show read-only warning:" },
+  { TYPE_EMPTY,		NULL,			""			},
   { TYPE_LEAVE_MENU,	execSetupMain, 		"Back"			},
 
   { 0,			NULL,			NULL			}