X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Flevel.cpp;h=78d4a1a6cdcfea375c0c646b473b3af7935b5318;hb=198f758764fff064a47630b5d0f1e3d6aabe95a8;hp=1a81bca0889239bd634cb8dc97e9cce1e4353c60;hpb=a113d3bd1feddd510e3b2852b0d42522735eee40;p=supertux.git

diff --git a/src/level.cpp b/src/level.cpp
index 1a81bca08..78d4a1a6c 100644
--- a/src/level.cpp
+++ b/src/level.cpp
@@ -20,9 +20,9 @@
 #include <config.h>
 
 #include <map>
-#include <cstdlib>
-#include <cstdio>
-#include <cstring>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include <iostream>
 #include <fstream>
 #include <sstream>
@@ -38,26 +38,38 @@
 #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"
 #include "object/camera.hpp"
 #include "object/tilemap.hpp"
 #include "object/coin.hpp"
+#include "object/block.hpp"
 
 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;
-    std::auto_ptr<lisp::Lisp> root (parser.parse(filepath));
+    const lisp::Lisp* root = parser.parse(filepath);
 
     const lisp::Lisp* level = root->get_lisp("supertux-level");
     if(!level)
@@ -66,10 +78,34 @@ 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 = "";
+
     lisp::ListIterator iter(level);
     while(iter.next()) {
       const std::string& token = iter.item();
@@ -78,10 +114,16 @@ 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") {
         iter.value()->get(author);
+      } else if(token == "contact") {
+        iter.value()->get(contact);
+      } else if(token == "license") {
+        iter.value()->get(license);
       } else if(token == "on-menukey-script") {
         iter.value()->get(on_menukey_script);
       } else if(token == "sector") {
@@ -90,15 +132,20 @@ Level::load(const std::string& filepath)
         add_sector(sector);
       } else {
         log_warning << "Unknown token '" << token << "' in level file" << std::endl;
-        continue;
       }
     }
 
+    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
@@ -141,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)
 {
@@ -184,7 +225,6 @@ Level::get_sector(size_t num)
 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;
@@ -192,7 +232,27 @@ Level::get_total_coins()
         o != sector->gameobjects.end(); ++o) {
       Coin* coin = dynamic_cast<Coin*> (*o);
       if(coin)
+      {
         total_coins++;
+        continue;
+      }
+      BonusBlock *block = dynamic_cast<BonusBlock*> (*o);
+      if(block)
+      {
+        if (block->contents == BonusBlock::CONTENT_COIN)
+        {
+          total_coins++;
+          continue;
+        }
+#if 0
+        // FIXME: do we want this? q.v. src/object/oneup.cpp
+        else if (block->contents == BonusBlock::CONTENT_1UP)
+        {
+          total_coins += 100;
+          continue;
+        }
+#endif
+      }
     }
   }
   return total_coins;