X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Flevel_subset.cpp;h=2366f8cf18469704b09af5574421638f62da56a7;hb=0e7fc4cada952c242f4915e9d424eda094583e21;hp=5cd4fc9d1d7123bb086b1012300eff4da43ca974;hpb=ef57479f613b900b73eba8e8f4d026aae0de25cc;p=supertux.git

diff --git a/src/level_subset.cpp b/src/level_subset.cpp
index 5cd4fc9d1..2366f8cf1 100644
--- 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())
@@ -102,6 +98,14 @@ void LevelSubset::load(const std::string& subset)
     throw new std::runtime_error(msg.str());
   }
 
+  // test is a worldmap exists
+  has_worldmap = false;
+  std::string worldmap = get_resource_filename(
+      std::string("levels/") + subset + "/worldmap.stwm");
+  if(worldmap != "") {
+    has_worldmap = true;
+  }
+
   if (levels.empty())
     { // Level info file doesn't define any levels, so read the
       // directory to see what we can find
@@ -110,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());
   
@@ -133,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()))
@@ -175,6 +179,12 @@ LevelSubset::get_level_filename(unsigned int num)
   return levels[num];
 }
 
+std::string
+LevelSubset::get_worldmap_filename()
+{
+  return std::string("/levels/" + name + "/worldmap.stwm");
+}
+
 int
 LevelSubset::get_num_levels() const
 {