X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Flevel.cpp;h=e9f8ccd537f3669a31c4c05fdc1e9038e5c98312;hb=aeec9baba33ec63d2d0fdd97d961a53ec5c1541d;hp=5ad193c33c744f8192de4e8fdaf4d55df739b6d6;hpb=a2bb3cfe11cdc2681d5ad84879126e0dcbf9db1e;p=supertux.git

diff --git a/src/level.cpp b/src/level.cpp
index 5ad193c33..e9f8ccd53 100644
--- a/src/level.cpp
+++ b/src/level.cpp
@@ -17,6 +17,7 @@
 //  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 <map>
 #include <cstdlib>
@@ -24,97 +25,95 @@
 #include <cstring>
 #include <iostream>
 #include <fstream>
+#include <sstream>
+#include <memory>
 #include <stdexcept>
 
-#include "app/globals.h"
-#include "app/setup.h"
-#include "camera.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 "utils/lispreader.h"
 #include "resources.h"
-#include "gameobjs.h"
-#include "utils/lispwriter.h"
-#include "tilemap.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"), time_left(500)
-
-{
-}
-
-void
-Level::create(const std::string& filename)
+  : name("noname"), author("Mr. X")
 {
-  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)
+Level::load(const std::string& filepath)
 {
-  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;
+  try {
+    lisp::Parser parser;
+    std::auto_ptr<lisp::Lisp> root (parser.parse(filepath));
+
+    const lisp::Lisp* level = root->get_lisp("supertux-level");
+    if(!level)
+      throw std::runtime_error("file is not a supertux-level file.");
+
+    int version = 1;
+    level->get("version", version);
+    if(version == 1) {
+      load_old_format(*level);
+
+#if 0
+      // test for now
+      FlipLevelTransformer* transformer = new FlipLevelTransformer();  
+      transformer->transform(this);
+#endif
+     
       return;
     }
-  }
-  
-  LispReader* level = LispReader::load(filepath, "supertux-level");
-
-  int version = 1;
-  level->read_int("version", version);
-  if(version == 1) {
-    load_old_format(*level);
-    delete level;
-    return;
-  }
 
-  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)));
-    lisp_object_t* data = lisp_car(lisp_cdr(lisp_car(cur)));
-    LispReader reader(lisp_cdr(lisp_car(cur)));
-
-    if(token == "name") {
-      name = lisp_string(data);
-    } else if(token == "author") {
-      author = lisp_string(data);
-    } else if(token == "time") {
-      time_left = lisp_integer(data);
-    } else if(token == "sector") {
-      Sector* sector = new Sector;
-      sector->parse(reader);
-      add_sector(sector);
-    } else {
-      std::cerr << "Unknown token '" << token << "' in level file.\n";
-      continue;
+    lisp::ListIterator iter(level);
+    while(iter.next()) {
+      const std::string& token = iter.item();
+      if(token == "version") {
+        iter.value()->get(version);
+        if(version > 2) {
+          std::cerr << "Warning: level format newer than application.\n";
+        }
+      } else if(token == "name") {
+        iter.value()->get(name);
+      } else if(token == "author") {
+        iter.value()->get(author);
+      } else if(token == "sector") {
+        Sector* sector = new Sector;
+        sector->parse(*(iter.lisp()));
+        add_sector(sector);
+      } 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();
+    throw std::runtime_error(msg.str());
   }
-  
-  delete level;
 }
 
 void
-Level::load_old_format(LispReader& reader)
+Level::load_old_format(const lisp::Lisp& reader)
 {
-  reader.read_string("name", name, true);
-  reader.read_string("author", author);
-  reader.read_int("time", time_left);
+  reader.get("name", name);
+  reader.get("author", author);
 
   Sector* sector = new Sector;
   sector->parse_old_format(reader);
@@ -124,104 +123,74 @@ Level::load_old_format(LispReader& 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);
- LispWriter* writer = new LispWriter(file);
+  std::string filepath = "levels/" + filename;
+  int last_slash = filepath.find_last_of('/');
+  FileSystem::fcreatedir(filepath.substr(0,last_slash).c_str());
+  filepath = user_dir + "/" + filepath;
+  ofstream file(filepath.c_str(), ios::out);
+  lisp::Writer* writer = new lisp::Writer(file);
 
- writer->write_comment("Level made using SuperTux's built-in Level Editor");
+  writer->write_comment("Level made using SuperTux's built-in Level Editor");
 
- writer->start_list("supertux-level");
+  writer->start_list("supertux-level");
 
- int version = 2;
- writer->write_int("version", version);
+  int version = 2;
+  writer->write_int("version", version);
 
- writer->write_string("name", name);
- writer->write_string("author", author);
- writer->write_int("time", time_left);
+  writer->write_string("name", name, true);
+  writer->write_string("author", author);
 
- for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i)
-   {
-   writer->start_list("sector");
-   i->second->write(*writer);
-   writer->end_list("sector");
-   }
+  for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) {
+    Sector* sector = *i;
+    writer->start_list("sector");
+    sector->write(*writer);
+    writer->end_list("sector");
+  }
 
- writer->end_list("supertux-level");
+  writer->end_list("supertux-level");
 
- delete writer;
- file.close();
+  delete writer;
+  file.close();
 }
 
 Level::~Level()
 {
   for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i)
-    delete i->second;
-}
-
-void
-Level::do_vertical_flip()
-{
-  for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i)
-    i->second->do_vertical_flip();
+    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
@@ -229,18 +198,24 @@ 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 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++;
+  for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) {
+    Sector* sector = *i;
+    for(Sector::GameObjects::iterator o = sector->gameobjects.begin();
+        o != sector->gameobjects.end(); ++o) {
+      Coin* coin = dynamic_cast<Coin*> (*o);
+      if(coin)
+        total_coins++;
+    }
+  }
   return total_coins;
 }
+