X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftile_manager.h;h=db8a70ccb88bbf6cb3bfb91df5fdac243f54700d;hb=40e6e7cdc59c09befbd2595aea0c6e10428315d4;hp=2faa36224382c09295cfd810e62639983d5d2743;hpb=6e843b1780f62f45b7021bd8c38181aa211588ee;p=supertux.git

diff --git a/src/tile_manager.h b/src/tile_manager.h
index 2faa36224..db8a70ccb 100644
--- a/src/tile_manager.h
+++ b/src/tile_manager.h
@@ -27,8 +27,7 @@
 #include <map>
 #include <stdint.h>
 #include <assert.h>
-
-class Tile;
+#include "tile.h"
 
 struct TileGroup
 {
@@ -43,24 +42,20 @@ struct TileGroup
 
 class TileManager
 {
- private:
-  TileManager();
-  ~TileManager();
-  
+private:
   typedef std::vector<Tile*> Tiles;
   Tiles tiles;
 
   static TileManager* instance_ ;
   std::set<TileGroup> tilegroups;
-  void load_tileset(std::string filename);
 
-  std::string current_tileset;
+  std::string tiles_path;
   
- public:
-  static TileManager* instance()
-  { return instance_ ? instance_ : instance_ = new TileManager(); }
-  static void destroy_instance()
-  { delete instance_; instance_ = 0; }
+  void load_tileset(std::string filename);
+
+public:
+  TileManager(const std::string& filename);
+  ~TileManager();
 
   const std::set<TileGroup>& get_tilegroups() const
   {
@@ -70,16 +65,16 @@ class TileManager
   const Tile* get(uint32_t id) const
   {
     assert(id < tiles.size());
-    Tile* t = tiles[id];
-    if (t) 
-      {
-        return t;
-      }
-    else
-      {
-        std::cout << "TileManager: Invalid tile: " << id << std::endl;
-        return tiles[0];
-      }
+    Tile* tile = tiles[id];
+    if(!tile) {
+      std::cout << "TileManager: Invalid tile: " << id << std::endl;
+      return tiles[0];
+    }
+
+    if(tile->images.size() == 0 && tile->imagespecs.size() != 0)
+      tile->load_images(tiles_path);
+    
+    return tile;
   }
 
   uint32_t get_max_tileid() const