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

diff --git a/src/level_subset.cpp b/src/level_subset.cpp
index 0d6d3ed7c..5cd4fc9d1 100644
--- a/src/level_subset.cpp
+++ b/src/level_subset.cpp
@@ -18,13 +18,20 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
 
+#include <config.h>
+
+#include <sstream>
+#include <stdexcept>
 #include <assert.h>
 #include <unistd.h>
 #include "app/setup.h"
 #include "level.h"
+#include "resources.h"
 #include "app/globals.h"
 #include "video/surface.h"
 #include "level_subset.h"
+#include "lisp/parser.h"
+#include "lisp/lisp.h"
 
 using namespace SuperTux;
 
@@ -58,25 +65,19 @@ 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);
-  lisp_object_t* cur = lisp_car(root_obj);
+  lisp::Parser parser;
+  std::auto_ptr<lisp::Lisp> root (parser.parse(info_file));
 
-  if (lisp_symbol_p(cur) && strcmp(lisp_symbol(cur), "supertux-level-subset") == 0)
-    {
-      LispReader reader(lisp_cdr(root_obj));
+  const lisp::Lisp* info = root->get_lisp("supertux-level-subset");
+  if(!info)
+    throw std::runtime_error("File is not a levelsubset file");
 
-      reader.read_string("title", title, true);
-      reader.read_string("description", description, true);
-      reader.read_string_vector("levels", levels);
-      hide_from_contribs = false;
-      reader.read_bool("hide-from-contribs", hide_from_contribs);
-    }
-  else
-    {
-      std::cout << "LevelSubset: parse error in info file: " << info_file << std::endl;
-    }
+  hide_from_contribs = false;
 
-  lisp_free(root_obj);
+  info->get("title", title);
+  info->get("description", description);
+  info->get_vector("levels", levels);
+  info->get("hide-from-contribs", hide_from_contribs);
 }
 
 void LevelSubset::load(const std::string& subset)
@@ -85,43 +86,39 @@ 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 = datadir + "/levels/" + subset + "/";
-      if (access(filename.c_str(), R_OK) == 0)
-        directory = filename;
-      else
-        std::cout << "Error: LevelSubset: couldn't find subset: " << subset << std::endl;
-    }
-  
-  read_info_file(directory + "info");
+  std::string filename = get_resource_filename(
+      std::string("levels/") + subset + "/info");
+  if(filename == "") {
+    std::stringstream msg;
+    msg << "Couldn't find level subset '" << subset << "'.";
+    throw new std::runtime_error(msg.str());
+  }
+ 
+  try {
+    read_info_file(filename);
+  } catch(std::exception& e) {
+    std::stringstream msg;
+    msg << "Couldn't parse info file '" << filename << "': " << e.what();
+    throw new std::runtime_error(msg.str());
+  }
 
   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(get_resource_filename(
+                  std::string("levels/" + subset+ "/" + *i)));
         }
     }
 }
@@ -158,7 +155,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 +172,7 @@ std::string
 LevelSubset::get_level_filename(unsigned int num)
 {
   assert(num < levels.size());
-  return directory + levels[num];
+  return levels[num];
 }
 
 int
@@ -183,5 +180,3 @@ LevelSubset::get_num_levels() const
 {
   return levels.size();
 }
-
-/* EOF */