// $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
// 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
#include "tile_manager.hpp"
#include "resources.hpp"
+TileManager* tile_manager = NULL;
+
TileManager::TileManager(const std::string& filename)
{
#ifdef DEBUG
} else {
tiles_path = filename.substr(0, t+1);
}
-
+
lisp::Parser parser;
- std::auto_ptr<lisp::Lisp> root (parser.parse(filename));
+ const lisp::Lisp* root = parser.parse(filename);
const lisp::Lisp* tiles_lisp = root->get_lisp("supertux-tiles");
if(!tiles_lisp)
if(iter.item() == "tile") {
Tile* tile = new Tile();
tile->parse(*(iter.lisp()));
- while(tile->id >= tiles.size()) {
- tiles.push_back(0);
- }
+
+ if(tile->id >= tiles.size())
+ tiles.resize(tile->id+1, 0);
+
if(tiles[tile->id] != 0) {
log_warning << "Tile with ID " << tile->id << " redefined" << std::endl;
+ delete tile;
+ } else {
+ tiles[tile->id] = tile;
}
- tiles[tile->id] = tile;
} else if(iter.item() == "tilegroup") {
TileGroup tilegroup;
const lisp::Lisp* tilegroup_lisp = iter.lisp();
std::string image;
// width and height of the image in tile units, this is used for two
- // purposes:
+ // 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
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;
+ if (tiles[ids[i]] == 0) {
+ tiles[ids[i]] = tile;
+ } else {
+ log_warning << "Tile with ID " << ids[i] << " redefined" << std::endl;
+ delete tile;
+ }
}
}
-
+
} else if(iter.item() == "properties") {
// deprecated
} else {
log_warning << "Unknown symbol '" << iter.item() << "' tile defintion file" << std::endl;
}
}
-}
+ if (0)
+ { // enable this if you want to see a list of free tiles
+ log_info << "Last Tile ID is " << tiles.size()-1 << std::endl;
+ int last = -1;
+ for(int i = 0; i < int(tiles.size()); ++i)
+ {
+ if (tiles[i] == 0 && last == -1)
+ {
+ last = i;
+ }
+ else if (tiles[i] && last != -1)
+ {
+ log_info << "Free Tile IDs (" << i - last << "): " << last << " - " << i-1 << std::endl;
+ last = -1;
+ }
+ }
+ }
+}