translation update

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

diff --git a/src/supertux/tile_set.hpp b/src/supertux/tile_set.hpp
index 467ec68..18db0ad 100644 (file)
--- a/src/supertux/tile_set.hpp
+++ b/src/supertux/tile_set.hpp
@@ -22,17 +22,20 @@
 #include "supertux/tile.hpp"
 #include "util/log.hpp"
 
+class Tile;
+
 class TileSet
 {
 private:
   typedef std::vector<Tile*> Tiles;
   Tiles tiles;
 
-  std::string tiles_path;
   bool        tiles_loaded;
 
   friend class TileManager;
   friend class Tile;
+  friend class TileSetParser;
+
   TileSet(const std::string& filename);
 
 public:
@@ -42,7 +45,7 @@ public:
   void merge(const TileSet *tileset, uint32_t start, uint32_t end,
              uint32_t offset);
 
-  const Tile* get(uint32_t id) const
+  const Tile* get(const uint32_t id) const
   {
     assert(id < tiles.size());
     Tile* tile = tiles[id];
@@ -51,8 +54,7 @@ public:
       return tiles[0];
     }
 
-    if(tile->images.size() == 0 && tile->imagespecs.size() != 0)
-      tile->load_images();
+    tile->load_images();
 
     return tile;
   }