X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftile_manager.cpp;h=f2c95e09dda58af871fdcf13c4a0499bc71c9051;hb=b47938ec825a6bbf5ef8f49f0f893d2647a79c71;hp=0c87f4e3fb02054fba26e486ab6281bd5b1076e4;hpb=4254c5c1c918e3a3c8fcdba82470d9400602e308;p=supertux.git

diff --git a/src/tile_manager.cpp b/src/tile_manager.cpp
index 0c87f4e3f..f2c95e09d 100644
--- a/src/tile_manager.cpp
+++ b/src/tile_manager.cpp
@@ -17,144 +17,75 @@
 //  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 <memory>
+#include <stdexcept>
 #include <assert.h>
 #include "video/drawing_context.h"
 #include "app/setup.h"
 #include "app/globals.h"
-#include "utils/lispreader.h"
+#include "lisp/lisp.h"
+#include "lisp/parser.h"
+#include "lisp/list_iterator.h"
 #include "tile.h"
 #include "tile_manager.h"
+#include "resources.h"
 #include "scene.h"
 
-TileManager* TileManager::instance_  = 0;
-std::set<TileGroup>* TileManager::tilegroups_  = 0;
-
-TileManager::TileManager()
+TileManager::TileManager(const std::string& filename)
 {
-  std::string filename = datadir + "/images/tilesets/supertux.stgt";
   load_tileset(filename);
 }
 
 TileManager::~TileManager()
 {
   for(Tiles::iterator i = tiles.begin(); i != tiles.end(); ++i)
-    delete i->second;
-
-  delete tilegroups_;
+    delete *i;
 }
 
 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->second;
+    delete *i;
   tiles.clear();
- 
-  lisp_object_t* root_obj = lisp_read_from_file(filename);
-
-  if (!root_obj)
-    Termination::abort("Couldn't load file", filename);
-
-  if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-tiles") == 0)
-    {
-      lisp_object_t* cur = lisp_cdr(root_obj);
-      int tileset_id = 0;
-
-      while(!lisp_nil_p(cur))
-        {
-          lisp_object_t* element = lisp_car(cur);
 
-          if (strcmp(lisp_symbol(lisp_car(element)), "tile") == 0)
-            {
-              LispReader reader(lisp_cdr(element));
-
-              Tile* tile = new Tile;
-              int tile_id = tile->read(reader);
-/*              if(tile_id < 0) {
-                std::cerr 
-                  << "Warning: parse error when reading a tile (id < 0), skipping.\n";
-                continue;
-              }*/
-
-              tiles[tile_id] = tile;
-            }
-          else if (strcmp(lisp_symbol(lisp_car(element)), "tileset") == 0)
-            {
-              LispReader reader(lisp_cdr(element));
-              std::string filename;
-              reader.read_string("file", filename);
-              filename = datadir + "/images/tilesets/" + filename;
-              load_tileset(filename);
-            }
-          else if (strcmp(lisp_symbol(lisp_car(element)), "tilegroup") == 0)
-            {
-              TileGroup new_;
-              LispReader reader(lisp_cdr(element));
-              reader.read_string("name", new_.name);
-              reader.read_int_vector("tiles", new_.tiles);	      
-              if(!tilegroups_)
-                tilegroups_ = new std::set<TileGroup>;
-              tilegroups_->insert(new_).first;
-            }
-          else if (strcmp(lisp_symbol(lisp_car(element)), "properties") == 0)
-            {
-              LispReader reader(lisp_cdr(element));
-              reader.read_int("id", tileset_id);
-              tileset_id *= 1000;
-            }
-          else
-            {
-              std::cerr << "Unknown symbol: " << 
-                lisp_symbol(lisp_car(element)) << "\n";
-            }
+  std::string::size_type t = filename.rfind('/');
+  if(t == std::string::npos) {
+    tiles_path = "";
+  } else {
+    tiles_path = filename.substr(0, t+1);
+  }
 
-          cur = lisp_cdr(cur);
-        }
+  lisp::Parser parser;
+  std::auto_ptr<lisp::Lisp> root (parser.parse(
+        get_resource_filename(filename)));
+
+  const lisp::Lisp* tiles_lisp = root->get_lisp("supertux-tiles");
+  if(!tiles_lisp)
+    throw std::runtime_error("file is not a supertux tiles file.");
+
+  lisp::ListIterator iter(tiles_lisp);
+  while(iter.next()) {
+    if(iter.item() == "tile") {
+      Tile* tile = new Tile();
+      tile->parse(*(iter.lisp()));
+      while(tile->id >= tiles.size()) {
+        tiles.push_back(0);
+      }
+      tiles[tile->id] = tile;
+    } else if(iter.item() == "tilegroup") {
+        TileGroup tilegroup;
+        const lisp::Lisp* tilegroup_lisp = iter.lisp();
+        tilegroup_lisp->get("name", tilegroup.name);
+        tilegroup_lisp->get_vector("tiles", tilegroup.tiles);
+        tilegroups.insert(tilegroup);
+    } else if(iter.item() == "properties") {
+      // deprecated
+    } else {
+      std::cerr << "Unknown symbol '" << iter.item() << "'.\n";
     }
-  else
-    {
-      assert(0);
-    }
-
-  lisp_free(root_obj);
-  current_tileset = filename;
-}
-
-void
-TileManager::draw_tile(DrawingContext& context, unsigned int c,
-    const Vector& pos, int layer)
-{
-  if(c == 0)
-    return;
-
-  Tile* tile = get(c);
-
-  if(!tile->images.size())
-    return;
-
-  if(tile->images.size() > 1)
-  {
-    size_t frame 
-      = ((global_frame_counter*25) / tile->anim_speed) % tile->images.size();
-    context.draw_surface(tile->images[frame], pos, layer);
-  }
-  else if (tile->images.size() == 1)
-  {
-    context.draw_surface(tile->images[0], pos, layer);
   }
 }
 
-Tile*
-TileManager::get(unsigned int id)
-{
-Tiles::iterator i = tiles.find(id);
-if(i == tiles.end())
-  return 0;
-return i->second;
-}
-
-/* EOF */