- readded paralax tiles, not so sure why they disappeared in the first place

[supertux.git] / src / tile_manager.cpp

diff --git a/src/tile_manager.cpp b/src/tile_manager.cpp
index 1cd8602..64cf7c0 100644 (file)
--- a/src/tile_manager.cpp
+++ b/src/tile_manager.cpp
@@ -17,7 +17,6 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
-
 #include <config.h>
 
 #include <assert.h>
@@ -45,9 +44,6 @@ TileManager::~TileManager()
 
 void TileManager::load_tileset(std::string filename)
 {
-  if(filename == current_tileset)
-    return;
-  
   // free old tiles
   for(Tiles::iterator i = tiles.begin(); i != tiles.end(); ++i)
     delete *i;
@@ -72,7 +68,7 @@ void TileManager::load_tileset(std::string filename)
         LispReader reader(lisp_cdr(element));
 
         Tile* tile = new Tile;
-        tile->read(reader);
+        tile->parse(reader);
 
         while(tile->id >= tiles.size()) {
             tiles.push_back(0);
@@ -111,6 +107,5 @@ void TileManager::load_tileset(std::string filename)
   }
 
   lisp_free(root_obj);
-  current_tileset = filename;
 }