X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftile_manager.cpp;h=6ade3d9bd8140720b40720aeb50457b27e1fdb24;hb=b08db3ab7e6d4447f8005dcf5a6c9e61a7f8e937;hp=f2c95e09dda58af871fdcf13c4a0499bc71c9051;hpb=ef57479f613b900b73eba8e8f4d026aae0de25cc;p=supertux.git

diff --git a/src/tile_manager.cpp b/src/tile_manager.cpp
index f2c95e09d..6ade3d9bd 100644
--- a/src/tile_manager.cpp
+++ b/src/tile_manager.cpp
@@ -21,17 +21,15 @@
 
 #include <memory>
 #include <stdexcept>
+#include <iostream>
 #include <assert.h>
-#include "video/drawing_context.h"
-#include "app/setup.h"
-#include "app/globals.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 "scene.h"
+#include "video/drawing_context.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::TileManager(const std::string& filename)
 {
@@ -57,10 +55,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)
@@ -84,7 +81,7 @@ void TileManager::load_tileset(std::string filename)
     } else if(iter.item() == "properties") {
       // deprecated
     } else {
-      std::cerr << "Unknown symbol '" << iter.item() << "'.\n";
+      std::cerr << "Unknown symbol '" << iter.item() << "' tile defintion file.\n";
     }
   }
 }