X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftile_manager.cpp;h=309311e3e55929ccf4e293929b49337b32f33d9a;hb=3e89eb527d5f3bca2cb8cd219784048764a148f5;hp=37cf79a9d1ae3f720ff4883d42597887fd56a07a;hpb=60908c905544776c376421b8d3e12eeb936c068f;p=supertux.git

diff --git a/src/tile_manager.cpp b/src/tile_manager.cpp
index 37cf79a9d..309311e3e 100644
--- 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,18 +22,30 @@
 
 #include <memory>
 #include <stdexcept>
+#include <sstream>
+#include <iostream>
 #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_manager.hpp"
+#include "resources.hpp"
+
+TileManager* tile_manager = NULL;
 
 TileManager::TileManager(const std::string& filename)
 {
+#ifdef DEBUG
+  Uint32 ticks = SDL_GetTicks();
+#endif
   load_tileset(filename);
+#ifdef DEBUG
+  log_debug << "Tiles loaded in " << (SDL_GetTicks() - ticks) / 1000.0 << " seconds" << std::endl;
+#endif
 }
 
 TileManager::~TileManager()
@@ -54,10 +67,9 @@ void TileManager::load_tileset(std::string filename)
   } else {
     tiles_path = filename.substr(0, t+1);
   }
-
+ 
   lisp::Parser parser;
-  std::auto_ptr<lisp::Lisp> root (parser.parse(
-        get_resource_filename(filename)));
+  std::auto_ptr<lisp::Lisp> root (parser.parse(filename));
 
   const lisp::Lisp* tiles_lisp = root->get_lisp("supertux-tiles");
   if(!tiles_lisp)
@@ -71,17 +83,65 @@ void TileManager::load_tileset(std::string filename)
       while(tile->id >= tiles.size()) {
         tiles.push_back(0);
       }
+      if(tiles[tile->id] != 0) {
+        log_warning << "Tile with ID " << tile->id << " redefined" << std::endl;
+      }
       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);
+      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() == "tiles") {
+      // List of ids (use 0 if the tile should be ignored)
+      std::vector<unsigned int> ids;
+      // List of attributes of the tile
+      std::vector<unsigned int> attributes;
+      std::string image;
+
+      // width and height of the image in tile units, this is used for two
+      // purposes: 
+      //  a) so we don't have to load the image here to know its dimensions
+      //  b) so that the resulting 'tiles' entry is more robust,
+      //  ie. enlarging the image won't break the tile id mapping
+      // FIXME: height is actually not used, since width might be enough for
+      // all purposes, still feels somewhat more natural this way
+      unsigned int width  = 0;
+      unsigned int height = 0;
+
+      iter.lisp()->get_vector("ids",        ids);
+      iter.lisp()->get_vector("attributes", attributes);
+      iter.lisp()->get("image",      image);
+      iter.lisp()->get("width",      width);
+      iter.lisp()->get("height",     height);
+
+      if (ids.size() != attributes.size())
+        {
+          std::ostringstream err;
+          err << "Number of ids (" << ids.size() <<  ") and attributes (" << attributes.size()
+              << ") missmatch for image '" << image << "', but must be equal";
+          throw std::runtime_error(err.str());
+        }
+
+      for(std::vector<unsigned int>::size_type i = 0; i < ids.size() && i < width*height; ++i)
+        {
+          if (ids[i])
+            {
+              if(ids[i] >= tiles.size())
+                tiles.resize(ids[i]+1, 0);
+
+              int x = 32*(i % width);
+              int y = 32*(i / width);
+              Tile* tile = new Tile(ids[i], attributes[i], Tile::ImageSpec(image, Rect(x, y, x + 32, y + 32)));
+              tiles[ids[i]] = tile;
+            }
+        }
+      
     } else if(iter.item() == "properties") {
       // deprecated
     } else {
-      std::cerr << "Unknown symbol '" << iter.item() << "'.\n";
+      log_warning << "Unknown symbol '" << iter.item() << "' tile defintion file" << std::endl;
     }
   }
 }