// $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 <sstream>
#include <iostream>
#include <assert.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_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()
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;
} else if(iter.item() == "properties") {
// deprecated
} else {
- std::cerr << "Unknown symbol '" << iter.item() << "' tile defintion file.\n";
+ log_warning << "Unknown symbol '" << iter.item() << "' tile defintion file" << std::endl;
}
}
}