X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Flevel_subset.cpp;h=0a67f1dafadf37f7ad4024518b0ea529756dd3f1;hb=ee6972038331a3c26a2a6a0bdb2baca25475b1d2;hp=0d6d3ed7cdb889b8eba98f944e60df23a4b59ced;hpb=e156f196d7af27d46a8b201470a1bd4c2ccb6990;p=supertux.git

diff --git a/src/level_subset.cpp b/src/level_subset.cpp
index 0d6d3ed7c..0a67f1daf 100644
--- a/src/level_subset.cpp
+++ b/src/level_subset.cpp
@@ -18,6 +18,8 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
 
+#include <config.h>
+
 #include <assert.h>
 #include <unistd.h>
 #include "app/setup.h"
@@ -59,6 +61,8 @@ void LevelSubset::create(const std::string& subset_name)
 void LevelSubset::read_info_file(const std::string& info_file)
 {
   lisp_object_t* root_obj = lisp_read_from_file(info_file);
+  if (root_obj == NULL)
+    return;
   lisp_object_t* cur = lisp_car(root_obj);
 
   if (lisp_symbol_p(cur) && strcmp(lisp_symbol(cur), "supertux-level-subset") == 0)
@@ -86,42 +90,32 @@ void LevelSubset::load(const std::string& subset)
   // Check in which directory our subset is located (ie. ~/.supertux/
   // or SUPERTUX_DATADIR)
   std::string filename;
-  filename = st_dir + "/levels/" + subset + "/";
-  if (access(filename.c_str(), R_OK) == 0)
-    {
-      directory = filename;
-    }
-  else
+  filename = st_dir + "/levels/" + subset + "/info";
+  if (access(filename.c_str(), R_OK) != 0)
     {
-      filename = datadir + "/levels/" + subset + "/";
-      if (access(filename.c_str(), R_OK) == 0)
-        directory = filename;
-      else
+      filename = datadir + "/levels/" + subset + "/info";
+      if (access(filename.c_str(), R_OK) != 0)
         std::cout << "Error: LevelSubset: couldn't find subset: " << subset << std::endl;
     }
   
-  read_info_file(directory + "info");
+  read_info_file(filename);
 
   if (levels.empty())
     { // Level info file doesn't define any levels, so read the
       // directory to see what we can find
       std::set<std::string> files;
   
+      filename = datadir + "/levels/" + subset + "/";
+      files = FileSystem::read_directory(filename);
+
       filename = st_dir + "/levels/" + subset + "/";
-      if(access(filename.c_str(), R_OK) == 0)
-        {
-          files = FileSystem::read_directory(filename);
-        }
-      else
-        {
-          filename = datadir + "/levels/" + subset + "/";
-          files = FileSystem::read_directory(filename);
-        }
+      std::set<std::string> user_files = FileSystem::read_directory(filename);
+      files.insert(user_files.begin(), user_files.end());
   
       for(std::set<std::string>::iterator i = files.begin(); i != files.end(); ++i)
         {
           if (has_suffix(*i, ".stl"))
-            levels.push_back(*i);
+            levels.push_back(subset+ "/" + *i);
         }
     }
 }
@@ -158,7 +152,7 @@ LevelSubset::save()
       fprintf(fi,"  (description \"%s\")\n", description.c_str());
 
       /* Save the hide from Contrbis menu boolean: */
-      fprintf(fi,"  (hide-from-contribs \"%s\")\n", hide_from_contribs ? "#t" : "#f");
+      fprintf(fi,"  (hide-from-contribs %s)\n", hide_from_contribs ? "#t" : "#f");
 
       fprintf( fi,")");
       fclose(fi);
@@ -175,7 +169,7 @@ std::string
 LevelSubset::get_level_filename(unsigned int num)
 {
   assert(num < levels.size());
-  return directory + levels[num];
+  return levels[num];
 }
 
 int