also test for .exe progs on win32

[supertux.git] / src / tile_manager.cpp

diff --git a/src/tile_manager.cpp b/src/tile_manager.cpp
index f2c95e0..5e941d0 100644 (file)
--- a/src/tile_manager.cpp
+++ b/src/tile_manager.cpp
@@ -22,16 +22,13 @@
 #include <memory>
 #include <stdexcept>
 #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 +54,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 +80,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";
     }
   }
 }