X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftile_manager.cpp;h=474b8f271799073c8e1192333c23368c1e427f4d;hb=0f0e6a3689e5d810ec55b68ff455210b1081a021;hp=e6a3a155bd4dd87b5f017bb456c77a9a90ec8847;hpb=f47014ecf483f4589651397f34cdb738892ff582;p=supertux.git

diff --git a/src/tile_manager.cpp b/src/tile_manager.cpp
index e6a3a155b..474b8f271 100644
--- a/src/tile_manager.cpp
+++ b/src/tile_manager.cpp
@@ -24,7 +24,9 @@
 #include <sstream>
 #include <iostream>
 #include <assert.h>
+#include <SDL.h>
 #include "video/drawing_context.hpp"
+#include "msg.hpp"
 #include "lisp/lisp.hpp"
 #include "lisp/parser.hpp"
 #include "lisp/list_iterator.hpp"
@@ -34,7 +36,13 @@
 
 TileManager::TileManager(const std::string& filename)
 {
+#ifdef DEBUG
+  Uint32 ticks = SDL_GetTicks();
+#endif
   load_tileset(filename);
+#ifdef DEBUG
+  msg_debug("Tiles loaded in " << (SDL_GetTicks() - ticks) / 1000.0 << "seconds");
+#endif
 }
 
 TileManager::~TileManager()
@@ -72,6 +80,9 @@ void TileManager::load_tileset(std::string filename)
       while(tile->id >= tiles.size()) {
         tiles.push_back(0);
       }
+      if(tiles[tile->id] != 0) {
+        msg_warning("Tile with ID " << tile->id << " redefined");
+      }
       tiles[tile->id] = tile;
     } else if(iter.item() == "tilegroup") {
       TileGroup tilegroup;
@@ -127,7 +138,7 @@ void TileManager::load_tileset(std::string filename)
     } else if(iter.item() == "properties") {
       // deprecated
     } else {
-      std::cerr << "Unknown symbol '" << iter.item() << "' tile defintion file.\n";
+      msg_warning("Unknown symbol '" << iter.item() << "' tile defintion file");
     }
   }
 }