X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftile.cpp;h=9e0d39bdd27d6a0fcc30799d66813be05987ff96;hb=657fc40723665c04b3150946f5bd66b6b0af9230;hp=3157c5104bfc3f0ffadf6e27cfa49f894ffcf3a6;hpb=82895aabbae07b59a19e09a61ca94cd7b1603702;p=supertux.git

diff --git a/src/tile.cpp b/src/tile.cpp
index 3157c5104..9e0d39bdd 100644
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -18,31 +18,36 @@
 //  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 "tile.hpp"
+
 #include <math.h>
 #include <assert.h>
 #include <iostream>
 #include <stdexcept>
 
 #include "lisp/lisp.hpp"
-#include "tile.hpp"
-#include "resources.hpp"
+#include "tile_set.hpp"
 #include "timer.hpp"
 #include "math/vector.hpp"
 #include "video/drawing_context.hpp"
 #include "log.hpp"
 
 
-Tile::Tile()
-  : id(0), attributes(0), data(0), anim_fps(1)
+Tile::Tile(const TileSet *new_tileset)
+  : tileset(new_tileset), attributes(0), data(0), anim_fps(1)
 {
 }
 
-Tile::Tile(unsigned int id, Uint32 attributes, const ImageSpec& imagespec)
-  : id(id), attributes(attributes), data(0), anim_fps(1)
+Tile::Tile(const TileSet *new_tileset, std::vector<std::string> images, Rect rect, Uint32 attributes, Uint32 data, float animfps)
+  : tileset(new_tileset), attributes(attributes), data(data), anim_fps(animfps)
 {
-  imagespecs.push_back(imagespec);
+  for(std::vector<std::string>::iterator i = images.begin(); i != images.end(); ++i) {
+      imagespecs.push_back(ImageSpec(*i, rect));
+  }
+  correct_attributes();
 }
 
 Tile::~Tile()
@@ -53,9 +58,10 @@ Tile::~Tile()
   }
 }
 
-void
+uint32_t
 Tile::parse(const lisp::Lisp& reader)
 {
+  uint32_t id;
   if(!reader.get("id", id)) {
     throw std::runtime_error("Missing tile-id.");
   }
@@ -100,9 +106,22 @@ Tile::parse(const lisp::Lisp& reader)
     attributes |= SOLID | SLOPE;
   }
 
-  const lisp::Lisp* images = reader.get_lisp("images");
+  const lisp::Lisp* images;
+#ifdef DEBUG
+  images = reader.get_lisp("editor-images");
   if(images)
     parse_images(*images);
+  else {
+#endif /*DEBUG*/
+    images = reader.get_lisp("images");
+    if(images)
+      parse_images(*images);
+#ifdef DEBUG
+  }
+#endif /*DEBUG*/
+
+  correct_attributes();
+  return id;
 }
 
 void
@@ -116,7 +135,8 @@ Tile::parse_images(const lisp::Lisp& images_lisp)
       cur->get(file);
       imagespecs.push_back(ImageSpec(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_type() == lisp::Lisp::TYPE_SYMBOL &&
+              cur->get_car()->get_symbol() == "region") {
       const lisp::Lisp* ptr = cur->get_cdr();
 
       std::string file;
@@ -137,14 +157,16 @@ Tile::parse_images(const lisp::Lisp& images_lisp)
 }
 
 void
-Tile::load_images(const std::string& tilesetpath)
+Tile::load_images()
 {
+  const std::string& tiles_path = tileset->tiles_path;
+
   assert(images.size() == 0);
   for(std::vector<ImageSpec>::iterator i = imagespecs.begin(); i !=
       imagespecs.end(); ++i) {
     const ImageSpec& spec = *i;
     Surface* surface;
-    std::string file = tilesetpath + spec.file;
+    std::string file = tiles_path + spec.file;
     if(spec.rect.get_width() <= 0) {
       surface = new Surface(file);
     } else {
@@ -168,3 +190,13 @@ Tile::draw(DrawingContext& context, const Vector& pos, int z_pos) const
     context.draw_surface(images[0], pos, z_pos);
   }
 }
+
+void Tile::correct_attributes()
+{
+  //Fix little oddities in attributes (not many, currently...)
+  if(!(attributes & SOLID) && (attributes & SLOPE || attributes & UNISOLID)) {
+    attributes |= SOLID;
+    //But still be vocal about it
+    log_warning << "Tile with image " << imagespecs[0].file << " needs solid attribute." << std::endl;
+  }
+}