X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Flevel.cpp;h=5ad193c33c744f8192de4e8fdaf4d55df739b6d6;hb=935c2f6a2a27248de63fba86b74a724675761487;hp=a13f2f26cd0ed57ad8a2e13d2d3ee0e647e48398;hpb=055fb8d0e2d75acff6185f5a4f5c75e0782503c5;p=supertux.git

diff --git a/src/level.cpp b/src/level.cpp
index a13f2f26c..5ad193c33 100644
--- a/src/level.cpp
+++ b/src/level.cpp
@@ -26,19 +26,20 @@
 #include <fstream>
 #include <stdexcept>
 
-#include "globals.h"
-#include "setup.h"
+#include "app/globals.h"
+#include "app/setup.h"
 #include "camera.h"
-#include "screen/screen.h"
+#include "video/screen.h"
 #include "level.h"
-#include "physic.h"
+#include "math/physic.h"
 #include "scene.h"
 #include "sector.h"
 #include "tile.h"
-#include "lispreader.h"
+#include "utils/lispreader.h"
 #include "resources.h"
 #include "gameobjs.h"
-#include "lispwriter.h"
+#include "utils/lispwriter.h"
+#include "tilemap.h"
 
 using namespace std;
 
@@ -49,9 +50,31 @@ Level::Level()
 }
 
 void
+Level::create(const std::string& filename)
+{
+  Level level;
+  const size_t width = 25;
+  const size_t height = 19;
+  level.add_sector(Sector::create("main", width, height));
+  level.save(filename);
+}
+
+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);
@@ -61,8 +84,6 @@ Level::load(const std::string& filename)
     return;
   }
 
-  vertical_flip = false;
-
   for(lisp_object_t* cur = level->get_lisp(); !lisp_nil_p(cur);
       cur = lisp_cdr(cur)) {
     std::string token = lisp_symbol(lisp_car(lisp_car(cur)));
@@ -75,8 +96,6 @@ Level::load(const std::string& filename)
       author = lisp_string(data);
     } else if(token == "time") {
       time_left = lisp_integer(data);
-    } else if(token == "flip") {
-      vertical_flip = lisp_boolean(data);
     } else if(token == "sector") {
       Sector* sector = new Sector;
       sector->parse(reader);
@@ -88,38 +107,28 @@ Level::load(const std::string& filename)
   }
   
   delete level;
-
-  if(vertical_flip)
-    {
-    for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i)
-      i->second->do_vertical_flip();
-    }
 }
 
 void
 Level::load_old_format(LispReader& reader)
 {
-  reader.read_string("name", name);
+  reader.read_string("name", name, true);
   reader.read_string("author", author);
   reader.read_int("time", time_left);
-  vertical_flip = false;
-  reader.read_bool("flip", vertical_flip);
 
   Sector* sector = new Sector;
   sector->parse_old_format(reader);
   add_sector(sector);
-
-  if(vertical_flip)
-    {
-    for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i)
-      i->second->do_vertical_flip();
-    }
 }
 
 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");
@@ -135,9 +144,6 @@ Level::save(const std::string& filename)
 
  for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i)
    {
-   if(vertical_flip)
-     i->second->do_vertical_flip();
-
    writer->start_list("sector");
    i->second->write(*writer);
    writer->end_list("sector");
@@ -156,6 +162,13 @@ Level::~Level()
 }
 
 void
+Level::do_vertical_flip()
+{
+  for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i)
+    i->second->do_vertical_flip();
+}
+
+void
 Level::add_sector(Sector* sector)
 {
   sectors.insert(std::make_pair(sector->get_name(), sector));       
@@ -171,3 +184,63 @@ 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()
+{
+  int total_badguys = 0;
+  for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i)
+    total_badguys += i->second->get_total_badguys();
+  return total_badguys;
+}
+
+int
+Level::get_total_coins()
+{
+  int total_coins = 0;
+  for(Sectors::iterator it = sectors.begin(); it != sectors.end(); ++it)
+    for(int x = 0; static_cast<unsigned int>(x) < it->second->solids->get_width(); x++)
+      for(int y = 0; static_cast<unsigned int>(y) < it->second->solids->get_height(); y++)
+        if(it->second->solids->get_tile(x,y)->attributes & Tile::COIN)
+          total_coins++;
+  return total_coins;
+}