Fix another small logic error

[supertux.git] / src / tile_manager.cpp

diff --git a/src/tile_manager.cpp b/src/tile_manager.cpp
index 0c80245..24f8021 100644 (file)
--- a/src/tile_manager.cpp
+++ b/src/tile_manager.cpp
@@ -1,7 +1,8 @@
 //  $Id$
-// 
+//
 //  SuperTux
 //  Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -12,7 +13,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
@@ -21,68 +22,75 @@
 
 #include <memory>
 #include <stdexcept>
+#include <sstream>
+#include <iostream>
+#include <limits>
 #include <assert.h>
-#include "video/drawing_context.h"
-#include "lisp/lisp.h"
-#include "lisp/parser.h"
-#include "lisp/list_iterator.h"
-#include "tile.h"
-#include "tile_manager.h"
-#include "resources.h"
+#include <SDL.h>
+#include "video/drawing_context.hpp"
+#include "log.hpp"
+#include "lisp/lisp.hpp"
+#include "lisp/parser.hpp"
+#include "lisp/list_iterator.hpp"
+#include "tile.hpp"
+#include "tile_set.hpp"
+#include "tile_manager.hpp"
+#include "resources.hpp"
+
+TileManager *tile_manager    = NULL;
+TileSet     *current_tileset = NULL;
 
-TileManager::TileManager(const std::string& filename)
+TileManager::TileManager()
 {
-  load_tileset(filename);
 }
 
 TileManager::~TileManager()
 {
-  for(Tiles::iterator i = tiles.begin(); i != tiles.end(); ++i)
-    delete *i;
 }
 
-void TileManager::load_tileset(std::string filename)
+TileSet* TileManager::get_tileset(const std::string &filename)
 {
-  // free old tiles
-  for(Tiles::iterator i = tiles.begin(); i != tiles.end(); ++i)
-    delete *i;
-  tiles.clear();
+  TileSets::const_iterator i = tilesets.find(filename);
+  if(i != tilesets.end())
+    return i->second;
 
-  std::string::size_type t = filename.rfind('/');
-  if(t == std::string::npos) {
-    tiles_path = "";
-  } else {
-    tiles_path = filename.substr(0, t+1);
-  }
+  std::auto_ptr<TileSet> tileset (new TileSet(filename));
+  tilesets.insert(std::make_pair(filename, tileset.get()));
 
-  lisp::Parser parser;
-  std::auto_ptr<lisp::Lisp> root (parser.parse(
-        get_resource_filename(filename)));
+  return tileset.release();
+}
 
-  const lisp::Lisp* tiles_lisp = root->get_lisp("supertux-tiles");
-  if(!tiles_lisp)
-    throw std::runtime_error("file is not a supertux tiles file.");
+TileSet* TileManager::parse_tileset_definition(const lisp::Lisp& reader)
+{
+  std::auto_ptr<TileSet> result(new TileSet());
 
-  lisp::ListIterator iter(tiles_lisp);
+  lisp::ListIterator iter(&reader);
   while(iter.next()) {
-    if(iter.item() == "tile") {
-      Tile* tile = new Tile();
-      tile->parse(*(iter.lisp()));
-      while(tile->id >= tiles.size()) {
-        tiles.push_back(0);
-      }
-      tiles[tile->id] = tile;
-    } else if(iter.item() == "tilegroup") {
-        TileGroup tilegroup;
-        const lisp::Lisp* tilegroup_lisp = iter.lisp();
-        tilegroup_lisp->get("name", tilegroup.name);
-        tilegroup_lisp->get_vector("tiles", tilegroup.tiles);
-        tilegroups.insert(tilegroup);
-    } else if(iter.item() == "properties") {
-      // deprecated
-    } else {
-      std::cerr << "Unknown symbol '" << iter.item() << "' tile defintion file.\n";
+    const std::string& token = iter.item();
+    if(token != "tileset") {
+      log_warning << "Skipping unrecognized token \"" << token << "\" in tileset definition" << std::endl;
+      continue;
     }
+    const lisp::Lisp* tileset_reader = iter.lisp();
+
+    std::string file; 
+    if (!tileset_reader->get("file", file)) {
+      log_warning << "Skipping tileset import without file name" << std::endl;
+      continue;
+    }
+
+    const TileSet *tileset = get_tileset(file);
+
+    uint32_t start  = 0;
+    uint32_t end    = std::numeric_limits<uint32_t>::max();
+    uint32_t offset = 0;
+    tileset_reader->get("start",  start);
+    tileset_reader->get("end",    end);
+    tileset_reader->get("offset", offset);
+
+    result->merge(tileset, start, end, offset);
   }
+
+  return result.release();
 }