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

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

diff --git a/src/supertux/tile.cpp b/src/supertux/tile.cpp
index 9369355..a0b73e1 100644 (file)
--- a/src/supertux/tile.cpp
+++ b/src/supertux/tile.cpp
@@ -20,34 +20,36 @@
 #include "supertux/tile_set.hpp"
 #include "video/drawing_context.hpp"
 
+bool Tile::draw_editor_images = false;
+
 Tile::Tile(const TileSet& new_tileset) :
   tileset(new_tileset), 
   imagespecs(),
   images(),
+  editor_imagespecs(),
+  editor_images(),
   attributes(0), 
   data(0), 
-  anim_fps(1)
+  fps(1)
 {
 }
 
-Tile::Tile(const TileSet& new_tileset, const std::vector<ImageSpec>& imagespecs_, 
-           uint32_t attributes, uint32_t data, float animfps) :
+Tile::Tile(const TileSet& new_tileset, const std::vector<ImageSpec>& imagespecs_, const std::vector<ImageSpec>& editor_imagespecs_, 
+           uint32_t attributes, uint32_t data, float fps) :
   tileset(new_tileset),
   imagespecs(imagespecs_),
   images(),
+  editor_imagespecs(editor_imagespecs_),
+  editor_images(),
   attributes(attributes), 
   data(data), 
-  anim_fps(animfps)
+  fps(fps)
 {
   correct_attributes();
 }
 
 Tile::~Tile()
 {
-  for(std::vector<Surface*>::iterator i = images.begin(); i != images.end();
-      ++i) {
-    delete *i;
-  }
 }
 
 void
@@ -60,29 +62,64 @@ Tile::load_images()
     {
       const ImageSpec& spec = *i;
 
-      Surface* surface;
+      SurfacePtr surface;
       if(spec.rect.get_width() <= 0) 
       {
-        surface = new Surface(spec.file);
+        surface = Surface::create(spec.file);
       }
       else 
       {
-        surface = new Surface(spec.file,
-                              Rect((int) spec.rect.p1.x,
-                                   (int) spec.rect.p1.y,
-                                   Size((int) spec.rect.get_width(),
-                                        (int) spec.rect.get_height())));
+        surface = Surface::create(spec.file,
+                                  Rect((int) spec.rect.p1.x,
+                                       (int) spec.rect.p1.y,
+                                       Size((int) spec.rect.get_width(),
+                                            (int) spec.rect.get_height())));
       }
       images.push_back(surface);
     }
   }
+
+  if(editor_images.size() == 0 && editor_imagespecs.size() != 0)
+  {
+    assert(editor_images.size() == 0);
+    for(std::vector<ImageSpec>::iterator i = editor_imagespecs.begin(); i != editor_imagespecs.end(); ++i) 
+    {
+      const ImageSpec& spec = *i;
+
+      SurfacePtr surface;
+      if(spec.rect.get_width() <= 0) 
+      {
+        surface = Surface::create(spec.file);
+      }
+      else 
+      {
+        surface = Surface::create(spec.file,
+                                  Rect((int) spec.rect.p1.x,
+                                       (int) spec.rect.p1.y,
+                                       Size((int) spec.rect.get_width(),
+                                            (int) spec.rect.get_height())));
+      }
+      editor_images.push_back(surface);
+    }
+  }
 }
 
 void
 Tile::draw(DrawingContext& context, const Vector& pos, int z_pos) const
 {
+  if(draw_editor_images) {
+    if(editor_images.size() > 1) {
+      size_t frame = size_t(game_time * fps) % editor_images.size();
+      context.draw_surface(editor_images[frame], pos, z_pos);
+      return;
+    } else if (editor_images.size() == 1) {
+      context.draw_surface(editor_images[0], pos, z_pos);
+      return;
+    }
+  }
+
   if(images.size() > 1) {
-    size_t frame = size_t(game_time * anim_fps) % images.size();
+    size_t frame = size_t(game_time * fps) % images.size();
     context.draw_surface(images[frame], pos, z_pos);
   } else if (images.size() == 1) {
     context.draw_surface(images[0], pos, z_pos);
@@ -104,10 +141,10 @@ void
 Tile::print_debug(int id) const
 {
   log_debug << " Tile: id " << id << ", data " << getData() << ", attributes " << getAttributes() << ":" << std::endl;
+  for(std::vector<Tile::ImageSpec>::const_iterator im = editor_imagespecs.begin(); im != editor_imagespecs.end(); ++im) 
+    log_debug << "  Editor Imagespec: file " << im->file << "; rect " << im->rect << std::endl;
   for(std::vector<Tile::ImageSpec>::const_iterator im = imagespecs.begin(); im != imagespecs.end(); ++im) 
-  {
-    log_debug << "  Imagespec: file " << im->file << "; rect " << im->rect << std::endl;
-  }
+    log_debug << "  Imagespec:        file " << im->file << "; rect " << im->rect << std::endl;
 }
 
 /* EOF */