Removed tile_path from tileset, instead give fully qualified path to the Tile

[supertux.git] / src / supertux / tile_set_parser.cpp

diff --git a/src/supertux/tile_set_parser.cpp b/src/supertux/tile_set_parser.cpp
index 8a11e52..e3fe52e 100644 (file)
--- a/src/supertux/tile_set_parser.cpp
+++ b/src/supertux/tile_set_parser.cpp
@@ -20,22 +20,22 @@
 #include <stdexcept>
 #include <sstream>
 
-#include "lisp/parser.hpp"
 #include "lisp/list_iterator.hpp"
+#include "lisp/parser.hpp"
 #include "supertux/tile_set.hpp"
 #include "util/file_system.hpp"
-#include "util/reader.hpp"
 
 TileSetParser::TileSetParser(TileSet& tileset, const std::string& filename) :
   m_tileset(tileset),
-  m_filename(filename)
+  m_filename(filename),
+  m_tiles_path()
 {  
 }
 
 void
 TileSetParser::parse()
 {
-  m_tileset.tiles_path = FileSystem::dirname(m_filename);
+  m_tiles_path = FileSystem::dirname(m_filename);
 
   m_tileset.tiles.resize(1, 0);
   m_tileset.tiles[0] = new Tile(m_tileset);
@@ -51,7 +51,7 @@ TileSetParser::parse()
   while(iter.next()) {
     if(iter.item() == "tile") {
       std::auto_ptr<Tile> tile(new Tile(m_tileset));
-      uint32_t id = tile->parse(*(iter.lisp()));
+      uint32_t id = parse_tile(*tile, *iter.lisp());
 
       if(id >= m_tileset.tiles.size())
         m_tileset.tiles.resize(id+1, 0);
@@ -87,8 +87,16 @@ TileSetParser::parse()
       bool has_attributes = iter.lisp()->get("attributes", attributes);
       bool has_datas = iter.lisp()->get("datas", datas);
 
-      if(!iter.lisp()->get("image",      images))
+      if (!iter.lisp()->get("image",      images))
+      {
         iter.lisp()->get( "images",      images);
+      }
+
+      // make the image path absolute
+      for(std::vector<std::string>::iterator i = images.begin(); i != images.end(); ++i)
+      {
+        *i = m_tiles_path + *i;
+      }
 
       iter.lisp()->get("width",      width);
       iter.lisp()->get("height",     height);
@@ -148,4 +156,112 @@ TileSetParser::parse()
   }
 }
 
+uint32_t
+TileSetParser::parse_tile(Tile& tile, const Reader& reader)
+{
+  uint32_t id;
+  if(!reader.get("id", id)) {
+    throw std::runtime_error("Missing tile-id.");
+  }
+
+  bool value = false;
+  if(reader.get("solid", value) && value)
+    tile.attributes |= Tile::SOLID;
+  if(reader.get("unisolid", value) && value)
+    tile.attributes |= Tile::UNISOLID | Tile::SOLID;
+  if(reader.get("brick", value) && value)
+    tile.attributes |= Tile::BRICK;
+  if(reader.get("ice", value) && value)
+    tile.attributes |= Tile::ICE;
+  if(reader.get("water", value) && value)
+    tile.attributes |= Tile::WATER;
+  if(reader.get("hurts", value) && value)
+    tile.attributes |= Tile::HURTS;
+  if(reader.get("fire", value) && value)
+    tile.attributes |= Tile::FIRE;
+  if(reader.get("fullbox", value) && value)
+    tile.attributes |= Tile::FULLBOX;
+  if(reader.get("coin", value) && value)
+    tile.attributes |= Tile::COIN;
+  if(reader.get("goal", value) && value)
+    tile.attributes |= Tile::GOAL;
+
+  if(reader.get("north", value) && value)
+    tile.data |= Tile::WORLDMAP_NORTH;
+  if(reader.get("south", value) && value)
+    tile.data |= Tile::WORLDMAP_SOUTH;
+  if(reader.get("west", value) && value)
+    tile.data |= Tile::WORLDMAP_WEST;
+  if(reader.get("east", value) && value)
+    tile.data |= Tile::WORLDMAP_EAST;
+  if(reader.get("stop", value) && value)
+    tile.data |= Tile::WORLDMAP_STOP;
+
+  reader.get("data", tile.data);
+  reader.get("anim-fps", tile.anim_fps);
+
+  if(reader.get("slope-type", tile.data)) {
+    tile.attributes |= Tile::SOLID | Tile::SLOPE;
+  }
+
+  const lisp::Lisp* images;
+#ifndef NDEBUG
+  images = reader.get_lisp("editor-images");
+  if(images)
+    parse_tile_images(tile, *images);
+  else {
+#endif
+    images = reader.get_lisp("images");
+    if(images)
+      parse_tile_images(tile, *images);
+#ifndef NDEBUG
+  }
+#endif
+
+  tile.correct_attributes();
+
+  return id;
+}
+
+void
+TileSetParser::parse_tile_images(Tile& tile, const Reader& images_lisp)
+{
+  const lisp::Lisp* list = &images_lisp;
+  while(list) 
+  {
+    const lisp::Lisp* cur = list->get_car();
+
+    if(cur->get_type() == lisp::Lisp::TYPE_STRING) 
+    {
+      std::string file;
+      cur->get(file);
+      tile.imagespecs.push_back(Tile::ImageSpec(m_tiles_path + file, Rect(0, 0, 0, 0)));
+    }
+    else if(cur->get_type() == lisp::Lisp::TYPE_CONS &&
+            cur->get_car()->get_type() == lisp::Lisp::TYPE_SYMBOL &&
+            cur->get_car()->get_symbol() == "region") 
+    {
+      const lisp::Lisp* ptr = cur->get_cdr();
+
+      std::string file;
+      float x = 0;
+      float y = 0;
+      float w = 0;
+      float h = 0;
+      ptr->get_car()->get(file); ptr = ptr->get_cdr();
+      ptr->get_car()->get(x); ptr = ptr->get_cdr();
+      ptr->get_car()->get(y); ptr = ptr->get_cdr();
+      ptr->get_car()->get(w); ptr = ptr->get_cdr();
+      ptr->get_car()->get(h);
+      tile.imagespecs.push_back(Tile::ImageSpec(m_tiles_path + file, Rect(x, y, x+w, y+h)));
+    } 
+    else 
+    {
+      log_warning << "Expected string or list in images tag" << std::endl;
+    }
+
+    list = list->get_cdr();
+  }
+}
+
 /* EOF */