fixed bug with screen keyboard still being active during request dialogs

[rocksndiamonds.git] / src / screens.c

diff --git a/src/screens.c b/src/screens.c
index 29ce84dc807dc78761e1542d66965c41cfddf803..d7e5016a54a7a71c0ea09416b53841db89fd4ac3 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -4260,12 +4260,16 @@ static void HandleTypeNameExt(boolean initialize, Key key)
   }
   else if (key == KSYM_Return)
   {
+    StopTextInput();
+
     setTypeNameValues(name, pos, TRUE);
 
     active = FALSE;
   }
   else if (key == KSYM_Escape)
   {
+    StopTextInput();
+
     setTypeNameValues(name, pos, FALSE);
 
     active = FALSE;
@@ -4275,8 +4279,6 @@ static void HandleTypeNameExt(boolean initialize, Key key)
 
   if (!active)
   {
-    StopTextInput();
-
     SetGameStatus(game_status_last_screen);
 
     if (game_status == GAME_MODE_MAIN)
@@ -4879,9 +4881,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 +6696,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:" },