X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Flevel.cpp;h=d6cd3c75331220ebf4d5c50ab468ce78e8279423;hb=e409aaf88c618c2fc47ff8f9bbe523b8f271c795;hp=c159d220c2986e2046428ddab2e1971da704b845;hpb=ef57479f613b900b73eba8e8f4d026aae0de25cc;p=supertux.git

diff --git a/src/level.cpp b/src/level.cpp
index c159d220c..d6cd3c753 100644
--- a/src/level.cpp
+++ b/src/level.cpp
@@ -29,29 +29,29 @@
 #include <memory>
 #include <stdexcept>
 
-#include "app/globals.h"
-#include "app/setup.h"
 #include "video/screen.h"
 #include "lisp/parser.h"
 #include "lisp/lisp.h"
 #include "lisp/list_iterator.h"
 #include "lisp/writer.h"
 #include "level.h"
-#include "math/physic.h"
-#include "scene.h"
+#include "physic.h"
 #include "sector.h"
 #include "tile.h"
 #include "resources.h"
+#include "file_system.h"
 #include "object/gameobjs.h"
 #include "object/camera.h"
 #include "object/tilemap.h"
 #include "object/coin.h"
 
+// test
+#include "flip_level_transformer.h"
+
 using namespace std;
 
 Level::Level()
-  : name("noname"), author("mr. x"), timelimit(500),
-    end_sequence_type(NONE_ENDSEQ_ANIM) 
+  : name("noname"), author("Mr. X")
 {
 }
 
@@ -85,26 +85,16 @@ Level::load(const std::string& filepath)
         iter.value()->get(name);
       } else if(token == "author") {
         iter.value()->get(author);
-      } else if(token == "time") {
-        iter.value()->get(timelimit);
       } else if(token == "sector") {
         Sector* sector = new Sector;
         sector->parse(*(iter.lisp()));
         add_sector(sector);
-      } else if(token == "end-sequence-animation") {
-        std::string endsequencename;
-        iter.value()->get(endsequencename);
-        if(endsequencename == "fireworks") {
-          end_sequence_type = FIREWORKS_ENDSEQ_ANIM;
-        } else {
-          std::cout << "Unknown endsequence type: '" << endsequencename <<
-            "'.\n";
-        }
       } else {
         std::cerr << "Unknown token '" << token << "' in level file.\n";
         continue;
       }
     }
+    
   } catch(std::exception& e) {
     std::stringstream msg;
     msg << "Problem when reading level '" << filepath << "': " << e.what();
@@ -117,7 +107,6 @@ Level::load_old_format(const lisp::Lisp& reader)
 {
   reader.get("name", name);
   reader.get("author", author);
-  reader.get("time", timelimit);
 
   Sector* sector = new Sector;
   sector->parse_old_format(reader);
@@ -127,12 +116,7 @@ Level::load_old_format(const lisp::Lisp& reader)
 void
 Level::save(const std::string& filename)
 {
-  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);
-  lisp::Writer* writer = new lisp::Writer(file);
+  lisp::Writer* writer = new lisp::Writer(filename);
 
   writer->write_comment("Level made using SuperTux's built-in Level Editor");
 
@@ -141,84 +125,59 @@ Level::save(const std::string& filename)
   int version = 2;
   writer->write_int("version", version);
 
-  writer->write_string("name", name);
+  writer->write_string("name", name, true);
   writer->write_string("author", author);
-  writer->write_int("time", timelimit);
-  writer->write_string("end-sequence-animation",
-      end_sequence_type == FIREWORKS_ENDSEQ_ANIM ? "fireworks" : "none");
 
   for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) {
+    Sector* sector = *i;
     writer->start_list("sector");
-    i->second->write(*writer);
+    sector->write(*writer);
     writer->end_list("sector");
   }
 
   writer->end_list("supertux-level");
 
   delete writer;
-  file.close();
 }
 
 Level::~Level()
 {
   for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i)
-    delete i->second;
+    delete *i;
 }
 
 void
 Level::add_sector(Sector* sector)
 {
-  sectors.insert(std::make_pair(sector->get_name(), sector));       
+  Sector* test = get_sector(sector->get_name());
+  if(test != 0) {
+    throw std::runtime_error("Trying to add 2 sectors with same name");
+  }
+  sectors.push_back(sector);
 }
 
 Sector*
 Level::get_sector(const std::string& name)
 {
-  Sectors::iterator i = sectors.find(name);
-  if(i == sectors.end())
-    return 0;
+  for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) {
+    Sector* sector = *i;
+    if(sector->get_name() == name)
+      return sector;
+  }
 
-  return i->second;
+  return 0;
 }
 
-Sector*
-Level::get_next_sector(const Sector* sector)
+size_t
+Level::get_sector_count()
 {
-  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;
+  return sectors.size();
 }
 
 Sector*
-Level::get_previous_sector(const Sector* sector)
+Level::get_sector(size_t num)
 {
-  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();
+  return sectors.at(num);
 }
 
 int
@@ -226,16 +185,17 @@ 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();
+    total_badguys += (*i)->get_total_badguys();
   return total_badguys;
 }
 
 int
 Level::get_total_coins()
 {
+  // FIXME not really correct as coins can also be inside blocks...
   int total_coins = 0;
   for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) {
-    Sector* sector = i->second;
+    Sector* sector = *i;
     for(Sector::GameObjects::iterator o = sector->gameobjects.begin();
         o != sector->gameobjects.end(); ++o) {
       Coin* coin = dynamic_cast<Coin*> (*o);
@@ -245,3 +205,4 @@ Level::get_total_coins()
   }
   return total_coins;
 }
+