X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftile_manager.cpp;h=c551acd757b85e35b7f4d9af29e76929b9761d72;hb=67690e081c28b818e94796be284206326bc8a6b9;hp=25c4997a9924f12121d89cd1320f86e1345da3f9;hpb=eb40ead9684fd22440c6deeaaf5c3408eead208a;p=supertux.git

diff --git a/src/tile_manager.cpp b/src/tile_manager.cpp
index 25c4997a9..c551acd75 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" << std::endl;
+#endif
 }
 
 TileManager::~TileManager()
@@ -73,7 +81,7 @@ void TileManager::load_tileset(std::string filename)
         tiles.push_back(0);
       }
       if(tiles[tile->id] != 0) {
-        std::cout << "Warning: Tile with ID " << tile->id << " redefined\n";
+        msg_warning << "Tile with ID " << tile->id << " redefined" << std::endl;
       }
       tiles[tile->id] = tile;
     } else if(iter.item() == "tilegroup") {
@@ -130,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" << std::endl;
     }
   }
 }