X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftile.cpp;h=900fc5b4c5bd423601c4fbc67ddd37e7333fe39b;hb=17384c690dbb1a212fd92c5f2237558ab973fd29;hp=e31e5dececbf189bdd8c1dc35d149a5dc0b2c42b;hpb=9b58f72e1c6900540c0ee00a800ed57d2c1f4974;p=supertux.git

diff --git a/src/tile.cpp b/src/tile.cpp
index e31e5dece..900fc5b4c 100644
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -20,13 +20,14 @@
 //  02111-1307, USA.
 #include <config.h>
 
-#include <cmath>
-#include <cassert>
+#include <math.h>
+#include <assert.h>
 #include <iostream>
 #include <stdexcept>
 
 #include "lisp/lisp.hpp"
 #include "tile.hpp"
+#include "tile_set.hpp"
 #include "resources.hpp"
 #include "timer.hpp"
 #include "math/vector.hpp"
@@ -34,15 +35,18 @@
 #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,13 +57,14 @@ 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.");
   }
-  
+
   bool value = false;
   if(reader.get("solid", value) && value)
     attributes |= SOLID;
@@ -73,6 +78,8 @@ Tile::parse(const lisp::Lisp& reader)
     attributes |= WATER;
   if(reader.get("hurts", value) && value)
     attributes |= HURTS;
+  if(reader.get("fire", value) && value)
+    attributes |= FIRE;
   if(reader.get("fullbox", value) && value)
     attributes |= FULLBOX;
   if(reader.get("coin", value) && value)
@@ -86,10 +93,10 @@ Tile::parse(const lisp::Lisp& reader)
     data |= WORLDMAP_SOUTH;
   if(reader.get("west", value) && value)
     data |= WORLDMAP_WEST;
-  if(reader.get("east", value) && value) 
+  if(reader.get("east", value) && value)
     data |= WORLDMAP_EAST;
   if(reader.get("stop", value) && value)
-    data |= WORLDMAP_STOP;                      
+    data |= WORLDMAP_STOP;
 
   reader.get("data", data);
   reader.get("anim-fps", anim_fps);
@@ -97,10 +104,13 @@ Tile::parse(const lisp::Lisp& reader)
   if(reader.get("slope-type", data)) {
     attributes |= SOLID | SLOPE;
   }
-  
+
   const lisp::Lisp* images = reader.get_lisp("images");
   if(images)
     parse_images(*images);
+
+  correct_attributes();
+  return id;
 }
 
 void
@@ -113,8 +123,9 @@ Tile::parse_images(const lisp::Lisp& images_lisp)
       std::string file;
       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) {
+    } 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;
@@ -129,20 +140,22 @@ Tile::parse_images(const lisp::Lisp& images_lisp)
       log_warning << "Expected string or list in images tag" << std::endl;
       continue;
     }
-    
+
     list = list->get_cdr();
   }
 }
 
 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 {
@@ -157,13 +170,22 @@ Tile::load_images(const std::string& tilesetpath)
 }
 
 void
-Tile::draw(DrawingContext& context, const Vector& pos, int layer) const
+Tile::draw(DrawingContext& context, const Vector& pos, int z_pos) const
 {
   if(images.size() > 1) {
     size_t frame = size_t(game_time * anim_fps) % images.size();
-    context.draw_surface(images[frame], pos, layer);
+    context.draw_surface(images[frame], pos, z_pos);
   } else if (images.size() == 1) {
-    context.draw_surface(images[0], pos, layer);
+    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;
+  }
+}