X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftile.cpp;h=ea18d8e56edfdb4a26c5803af2df755f9d966754;hb=b50836ea0d5c455c115fba76616ba544aad5ae5f;hp=f2d77ddaef7b3c9f8485716af9ebc07bd5510142;hpb=67690e081c28b818e94796be284206326bc8a6b9;p=supertux.git

diff --git a/src/tile.cpp b/src/tile.cpp
index f2d77ddae..ea18d8e56 100644
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -1,7 +1,8 @@
 //  $Id$
-// 
+//
 //  SuperTux
 //  Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -12,7 +13,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
@@ -30,16 +31,16 @@
 #include "timer.hpp"
 #include "math/vector.hpp"
 #include "video/drawing_context.hpp"
-#include "msg.hpp"
+#include "log.hpp"
 
 
 Tile::Tile()
-  : id(0), editor_image(0), attributes(0), data(0), anim_fps(1)
+  : id(0), attributes(0), data(0), anim_fps(1)
 {
 }
 
-Tile::Tile(unsigned int id_, Uint32 attributes_, const ImageSpec& imagespec)
-  : id(id_), editor_image(0), attributes(attributes_), data(0), anim_fps(1)
+Tile::Tile(unsigned int id, Uint32 attributes, const ImageSpec& imagespec)
+  : id(id), attributes(attributes), data(0), anim_fps(1)
 {
   imagespecs.push_back(imagespec);
 }
@@ -50,7 +51,6 @@ Tile::~Tile()
       ++i) {
     delete *i;
   }
-  delete editor_image;
 }
 
 void
@@ -59,7 +59,7 @@ Tile::parse(const lisp::Lisp& reader)
   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 +73,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 +88,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,11 +99,10 @@ 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);
-  reader.get("editor-images", editor_imagefile);
 }
 
 void
@@ -114,7 +115,7 @@ 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 && 
+    } else if(cur->get_type() == lisp::Lisp::TYPE_CONS &&
         cur->get_car()->get_type() == lisp::Lisp::TYPE_SYMBOL) {
       const lisp::Lisp* ptr = cur->get_cdr();
 
@@ -127,10 +128,10 @@ Tile::parse_images(const lisp::Lisp& images_lisp)
       ptr->get_car()->get(h);
       imagespecs.push_back(ImageSpec(file, Rect(x, y, x+w, y+h)));
     } else {
-      msg_warning << "Expected string or list in images tag" << std::endl;
+      log_warning << "Expected string or list in images tag" << std::endl;
       continue;
     }
-    
+
     list = list->get_cdr();
   }
 }
@@ -155,30 +156,15 @@ Tile::load_images(const std::string& tilesetpath)
     }
     images.push_back(surface);
   }
-  if(editor_imagefile != "") {
-    editor_image = new Surface(tilesetpath + editor_imagefile);
-  }
-}
-
-Surface*
-Tile::get_editor_image() const
-{
-  if(editor_image)
-    return editor_image;
-  if(images.size() > 0)
-    return images[0];
-
-  return 0;
 }
 
 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);
   }
 }
-