Reverted part of revision 02c347cdae86.

[supertux.git] / src / supertux / tile_set_parser.hpp

diff --git a/src/supertux/tile_set_parser.hpp b/src/supertux/tile_set_parser.hpp
index 04adbda..c94c178 100644 (file)
--- a/src/supertux/tile_set_parser.hpp
+++ b/src/supertux/tile_set_parser.hpp
@@ -20,7 +20,9 @@
 
 #include <string>
 #include <stdint.h>
+#include <vector>
 
+#include "supertux/tile.hpp"
 #include "util/reader_fwd.hpp"
 
 class TileSet;
@@ -31,6 +33,7 @@ class TileSetParser
 private:
   TileSet&    m_tileset;
   std::string m_filename;
+  std::string m_tiles_path;
   
 public:
   TileSetParser(TileSet& tileset, const std::string& filename);
@@ -38,8 +41,9 @@ public:
   void parse();
 
 private:
-  uint32_t parse_tile(Tile& tile, const Reader& reader);
-  void parse_images(Tile& tile, const Reader& cur);
+  void parse_tile(const Reader& reader);
+  void parse_tiles(const Reader& reader);
+  std::vector<Tile::ImageSpec> parse_tile_images(const Reader& cur);
   
 private:
   TileSetParser(const TileSetParser&);