Removed made public variables private in JoystickManager and KeyboardManager

[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 88c7ea5..38ecff1 100644 (file)
--- a/src/supertux/tile_set_parser.hpp
+++ b/src/supertux/tile_set_parser.hpp
@@ -1,6 +1,6 @@
 //  SuperTux
 //  Copyright (C) 2008 Matthias Braun <matze@braunis.de>,
-//                     Ingo Ruhnke <grumbel@gmx.de>
+//                     Ingo Ruhnke <grumbel@gmail.com>
 //
 //  This program is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
@@ -20,7 +20,9 @@
 
 #include <string>
 #include <stdint.h>
+#include <vector>
 
+#include "supertux/tile.hpp"
 #include "util/reader_fwd.hpp"
 
 class TileSet;
@@ -32,16 +34,17 @@ private:
   TileSet&    m_tileset;
   std::string m_filename;
   std::string m_tiles_path;
-  
+
 public:
   TileSetParser(TileSet& tileset, const std::string& filename);
-  
+
   void parse();
 
 private:
-  uint32_t parse_tile(Tile& tile, const Reader& reader);
-  void parse_tile_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&);
   TileSetParser& operator=(const TileSetParser&);