forgot to add files

[supertux.git] / src / level_subset.cpp

diff --git a/src/level_subset.cpp b/src/level_subset.cpp
index 9d1b246..2366f8c 100644 (file)
--- a/src/level_subset.cpp
+++ b/src/level_subset.cpp
@@ -17,24 +17,20 @@
 //  along with this program; if not, write to the Free Software
 //  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 "file_system.h"
 #include "video/surface.h"
 #include "level_subset.h"
 #include "lisp/parser.h"
 #include "lisp/lisp.h"
 
-using namespace SuperTux;
-
 static bool has_suffix(const std::string& data, const std::string& suffix)
 {
   if (data.length() >= suffix.length())
@@ -118,7 +114,7 @@ void LevelSubset::load(const std::string& subset)
       filename = datadir + "/levels/" + subset + "/";
       files = FileSystem::read_directory(filename);
 
-      filename = st_dir + "/levels/" + subset + "/";
+      filename = user_dir + "/levels/" + subset + "/";
       std::set<std::string> user_files = FileSystem::read_directory(filename);
       files.insert(user_files.begin(), user_files.end());
   
@@ -141,7 +137,7 @@ LevelSubset::save()
   filename = "/levels/" + name + "/";
 
   FileSystem::fcreatedir(filename.c_str());
-  filename = std::string(st_dir) + "/levels/" + name + "/info";
+  filename = std::string(user_dir) + "/levels/" + name + "/info";
   if(!FileSystem::fwriteable(filename.c_str()))
     filename = datadir + "/levels/" + name + "/info";
   if(FileSystem::fwriteable(filename.c_str()))