X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Flevel.cpp;h=78d4a1a6cdcfea375c0c646b473b3af7935b5318;hb=89c801d4e00a0be36f6ad693a055505968ef9514;hp=4b222bb8a25214f9d89cd9d5b69d32601333f8b6;hpb=5c843ebcc747e2b396abdeef159919d5d7f40496;p=supertux.git

diff --git a/src/level.cpp b/src/level.cpp
index 4b222bb8a..78d4a1a6c 100644
--- a/src/level.cpp
+++ b/src/level.cpp
@@ -38,6 +38,8 @@
 #include "physic.hpp"
 #include "sector.hpp"
 #include "tile.hpp"
+#include "tile_set.hpp"
+#include "tile_manager.hpp"
 #include "resources.hpp"
 #include "file_system.hpp"
 #include "object/gameobjs.hpp"
@@ -49,14 +51,23 @@
 using namespace std;
 
 Level::Level()
-  : name("noname"), author("Mr. X")
+  : name("noname"), author("Mr. X"), tileset(NULL), free_tileset(false)
 {
 }
 
+Level::~Level()
+{
+  for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i)
+    delete *i;
+  if(free_tileset)
+    delete tileset;
+}
+
 void
 Level::load(const std::string& filepath)
 {
   try {
+    filename = filepath;
     lisp::Parser parser;
     const lisp::Lisp* root = parser.parse(filepath);
 
@@ -67,10 +78,31 @@ Level::load(const std::string& filepath)
     int version = 1;
     level->get("version", version);
     if(version == 1) {
+      log_info << "level uses old format: version 1" << std::endl;
+      tileset = tile_manager->get_tileset("images/tiles.strf");
       load_old_format(*level);
       return;
     }
 
+    const lisp::Lisp* tilesets_lisp = level->get_lisp("tilesets");
+    if(tilesets_lisp != NULL) {
+      tileset      = tile_manager->parse_tileset_definition(*tilesets_lisp);
+      free_tileset = true;
+    }
+    std::string tileset_name;
+    if(level->get("tileset", tileset_name)) {
+      if(tileset != NULL) {
+        log_warning << "multiple tilesets specified in level" << std::endl;
+      } else {
+        tileset = tile_manager->get_tileset(tileset_name);
+      }
+    }
+    /* load default tileset */
+    if(tileset == NULL) {
+      tileset = tile_manager->get_tileset("images/tiles.strf");
+    }
+    current_tileset = tileset;
+
     contact = "";
     license = "";
 
@@ -82,6 +114,8 @@ Level::load(const std::string& filepath)
         if(version > 2) {
           log_warning << "level format newer than application" << std::endl;
         }
+      } else if(token == "tileset" || token == "tilesets") {
+        continue;
       } else if(token == "name") {
         iter.value()->get(name);
       } else if(token == "author") {
@@ -101,13 +135,17 @@ Level::load(const std::string& filepath)
       }
     }
 
-  if (license == "") log_warning << "The level author did not specify a license for this level. You might not be allowed to share it." << std::endl;
+    if (license == "") {
+      log_warning << "The level author did not specify a license for this level. You might not be allowed to share it." << std::endl;
 
+    }
   } catch(std::exception& e) {
     std::stringstream msg;
     msg << "Problem when reading level '" << filepath << "': " << e.what();
     throw std::runtime_error(msg.str());
   }
+
+  current_tileset = NULL;
 }
 
 void
@@ -150,12 +188,6 @@ Level::save(const std::string& filename)
   delete writer;
 }
 
-Level::~Level()
-{
-  for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i)
-    delete *i;
-}
-
 void
 Level::add_sector(Sector* sector)
 {