minor change of text in request dialogs

[rocksndiamonds.git] / src / screens.c

diff --git a/src/screens.c b/src/screens.c
index 95f05bf10b337eae5f82094f27ca0a2bb5d79573..5254a19fca9b2be1394bce4afd64e0984f18ffcb 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -2169,7 +2169,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
       {
        if (leveldir_current->readonly &&
            !strEqual(setup.player_name, "Artsoft"))
-         Request("This level is read only!", REQ_CONFIRM);
+         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)