X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Flevel_subset.cpp;h=39bc622294839ed191c333f9816278d58e326d74;hb=09f643fc22ff3c74ea24a60dedfd2a6e2d17b413;hp=25785d164376d516409858caf74592e0f7adfdae;hpb=7dd997b1207127e88f42915ec8bc1aa8e7599ad1;p=supertux.git

diff --git a/src/level_subset.cpp b/src/level_subset.cpp
index 25785d164..39bc62229 100644
--- a/src/level_subset.cpp
+++ b/src/level_subset.cpp
@@ -19,12 +19,16 @@
 //  02111-1307, USA.
 
 #include <assert.h>
-#include "setup.h"
+#include <unistd.h>
+
+#include "app/setup.h"
 #include "level.h"
-#include "globals.h"
-#include "screen/surface.h"
+#include "app/globals.h"
+#include "video/surface.h"
 #include "level_subset.h"
 
+using namespace SuperTux;
+
 static bool has_suffix(const std::string& data, const std::string& suffix)
 {
   if (data.length() >= suffix.length())
@@ -61,8 +65,8 @@ void LevelSubset::read_info_file(const std::string& info_file)
     {
       LispReader reader(lisp_cdr(root_obj));
 
-      reader.read_string("title", title);
-      reader.read_string("description", description);
+      reader.read_string("title", title, true);
+      reader.read_string("description", description, true);
       reader.read_string_vector("levels", levels);
     }
   else
@@ -104,12 +108,12 @@ void LevelSubset::load(const char* subset)
       snprintf(filename, 1024, "%s/levels/%s/", st_dir, subset);
       if(access(filename, R_OK) == 0)
         {
-          files = read_directory(filename);
+          files = FileSystem::read_directory(filename);
         }
       else
         {
           snprintf(filename, 1024, "%s/levels/%s/", datadir.c_str(), subset);
-          files = read_directory(filename);
+          files = FileSystem::read_directory(filename);
         }
   
       for(std::vector<std::string>::iterator i = files.begin(); i != files.end(); ++i)
@@ -129,11 +133,11 @@ LevelSubset::save()
   /* Save data file: */
   filename = "/levels/" + name + "/";
 
-  fcreatedir(filename.c_str());
+  FileSystem::fcreatedir(filename.c_str());
   filename = std::string(st_dir) + "/levels/" + name + "/info";
-  if(!fwriteable(filename.c_str()))
+  if(!FileSystem::fwriteable(filename.c_str()))
     filename = datadir + "/levels/" + name + "/info";
-  if(fwriteable(filename.c_str()))
+  if(FileSystem::fwriteable(filename.c_str()))
     {
       fi = fopen(filename.c_str(), "w");
       if (fi == NULL)