added support for "Home" and "End" keys to text gadgets

[rocksndiamonds.git] / src / libgame / setup.c

diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index 1c3a5dc73ea3429abc4b7f16e84bf2fefe5a36ac..fa696c581e2d1a69c966a0d4fe54d3c153aaf010 100644 (file)
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -1371,10 +1371,13 @@ void InitUserLevelDirectory(char *level_subdir)
   {
     createDirectory(getMainUserGameDataDir(), "main user data");
     createDirectory(getUserLevelDir(NULL), "main user level");
-    createDirectory(getUserLevelDir(level_subdir), "user level");
 
     if (setup.internal.create_user_levelset)
+    {
+      createDirectory(getUserLevelDir(level_subdir), "user level");
+
       SaveUserLevelInfo();
+    }
   }
 }
 
@@ -3890,9 +3893,13 @@ static void LoadLevelInfoFromLevelDir(TreeInfo **node_first,
                                                    level_directory, ".");
   }
 
-  if (!valid_entry_found)
+  boolean valid_entry_expected =
+    (strEqual(level_directory, options.level_directory) ||
+     setup.internal.create_user_levelset);
+
+  if (valid_entry_expected && !valid_entry_found)
     Warn("cannot find any valid level series in directory '%s'",
-         level_directory);
+        level_directory);
 }
 
 boolean AdjustGraphicsForEMC(void)