X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Flevel.cpp;h=21069c7fd72f956bd4a14f854036fce6d7f57ca4;hb=35fa5542fadf1848919363620c7a76b04150c283;hp=aad2bf95934afebefa5ed89af11222676b6ee940;hpb=3fcc45aed0cc7675b82082d139745c8130965299;p=supertux.git

diff --git a/src/level.cpp b/src/level.cpp
index aad2bf959..21069c7fd 100644
--- a/src/level.cpp
+++ b/src/level.cpp
@@ -52,7 +52,19 @@ Level::Level()
 void
 Level::load(const std::string& filename)
 {
-  LispReader* level = LispReader::load(filename, "supertux-level");
+  std::string filepath;
+  filepath = st_dir + "/levels/" + filename;
+  if (access(filepath.c_str(), R_OK) != 0)
+  {
+    filepath = datadir + "/levels/" + filename;
+    if (access(filepath.c_str(), R_OK) != 0)
+    {
+      std::cerr << "Error: Level: couldn't find level: " << filename << std::endl;
+      return;
+    }
+  }
+  
+  LispReader* level = LispReader::load(filepath, "supertux-level");
 
   int version = 1;
   level->read_int("version", version);
@@ -102,7 +114,11 @@ Level::load_old_format(LispReader& reader)
 void
 Level::save(const std::string& filename)
 {
- ofstream file(filename.c_str(), ios::out);
+ std::string filepath = "levels/" + filename;
+ int last_slash = filepath.find_last_of('/');
+ FileSystem::fcreatedir(filepath.substr(0,last_slash).c_str());
+ filepath = st_dir + "/" + filepath;
+ ofstream file(filepath.c_str(), ios::out);
  LispWriter* writer = new LispWriter(file);
 
  writer->write_comment("Level made using SuperTux's built-in Level Editor");
@@ -158,6 +174,46 @@ Level::get_sector(const std::string& name)
   return i->second;
 }
 
+Sector*
+Level::get_next_sector(const Sector* sector)
+{
+  for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i)
+    {
+    if(i->second == sector)
+      {
+      i++;
+      if(i == sectors.end())
+        return NULL;
+      return i->second;
+      }
+    }
+  std::cerr << "Warning: Sector not found on level\n";
+  return NULL;
+}
+
+Sector*
+Level::get_previous_sector(const Sector* sector)
+{
+  for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i)
+    {
+    if(i->second == sector)
+      {
+      if(i == sectors.begin())
+        return NULL;
+      i--;
+      return i->second;
+      }
+    }
+  std::cerr << "Warning: Sector not found on level\n";
+  return NULL;
+}
+
+int
+Level::get_total_sectors()
+{
+return sectors.size();
+}
+
 int
 Level::get_total_badguys()
 {