Console logging is now identical in all builds; warning and error show the console...

[supertux.git] / src / supertux / tile.hpp

diff --git a/src/supertux/tile.hpp b/src/supertux/tile.hpp
index 690aef3..60b3991 100644 (file)
--- a/src/supertux/tile.hpp
+++ b/src/supertux/tile.hpp
@@ -31,6 +31,7 @@ class DrawingContext;
 class Tile
 {
 public:
+  static bool draw_editor_images;
   /// bitset for tile attributes
   enum {
     /** solid tile that is indestructible by Tux */
@@ -94,7 +95,9 @@ public:
 private:
   const TileSet&         tileset;
   std::vector<ImageSpec> imagespecs;
-  std::vector<Surface*>  images;
+  std::vector<SurfacePtr>  images;
+  std::vector<ImageSpec> editor_imagespecs;
+  std::vector<SurfacePtr>  editor_images;
 
   /// tile attributes
   uint32_t attributes;
@@ -102,12 +105,12 @@ private:
   /** General purpose data attached to a tile (content of a box, type of coin)*/
   int data;
 
-  float anim_fps;
+  float fps;
 
 public:
   Tile(const TileSet& tileset);
-  Tile(const TileSet& tileset, const std::vector<ImageSpec>& images,
-       uint32_t attributes, uint32_t data, float animfps);
+  Tile(const TileSet& tileset, const std::vector<ImageSpec>& images, const std::vector<ImageSpec>& editor_images,
+       uint32_t attributes, uint32_t data, float fps);
   ~Tile();
 
   /** load Surfaces, if not already loaded */