X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftile.cpp;h=7c7204a82a7f49e586d461aa78113e230dd26438;hb=6e843b1780f62f45b7021bd8c38181aa211588ee;hp=964686b001b91bc080fd6675572be567ab1737da;hpb=192c17906bbfdc1319ae0fb5ec9d5f1259742221;p=supertux.git

diff --git a/src/tile.cpp b/src/tile.cpp
index 964686b00..7c7204a82 100644
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -17,16 +17,19 @@
 //  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 <cmath>
 #include <cassert>
 #include <iostream>
+#include <stdexcept>
 
-#include "globals.h"
+#include "app/globals.h"
 #include "tile.h"
 #include "scene.h"
-#include "lispreader.h"
-#include "vector.h"
-#include "screen/drawing_context.h"
+#include "utils/lispreader.h"
+#include "math/vector.h"
+#include "video/drawing_context.h"
 
 /** Dirty little helper to create a surface from a snipped of lisp:
  *
@@ -39,7 +42,7 @@ Surface* create_surface(lisp_object_t* cur)
   if (lisp_string_p(cur))
     {
       return new Surface(datadir + "/images/tilesets/" + lisp_string(cur),
-                         USE_ALPHA);
+                         true);
     }
   else if (lisp_cons_p(cur) && lisp_symbol_p(lisp_car(cur)))
     {
@@ -55,7 +58,7 @@ Surface* create_surface(lisp_object_t* cur)
                                  lisp_integer(lisp_list_nth(data, 2)),
                                  lisp_integer(lisp_list_nth(data, 3)),
                                  lisp_integer(lisp_list_nth(data, 4)),
-                                 USE_ALPHA);
+                                 true);
             }
           else
             {
@@ -97,7 +100,7 @@ std::vector<Surface*> create_surfaces(lisp_object_t* cur)
 }
 
 Tile::Tile()
-  : id(-1), attributes(0), data(0), next_tile(0), anim_speed(25)
+  : id(0), attributes(0), data(0), next_tile(0), anim_fps(1)
 {
 }
 
@@ -113,19 +116,18 @@ Tile::~Tile()
   }
 }
 
-int
+void
 Tile::read(LispReader& reader)
 {
-  if(!reader.read_int("id", id)) {
-    std::cerr << "Missing tile-id.\n";
-    return -1;
+  if(!reader.read_uint("id", id)) {
+    throw std::runtime_error("Missing tile-id.");
   }
   
   bool value;
   if(reader.read_bool("solid", value) && value)
     attributes |= SOLID;
   if(reader.read_bool("unisolid", value) && value)
-    attributes |= GOAL;                            
+    attributes |= UNISOLID | SOLID;
   if(reader.read_bool("brick", value) && value)
     attributes |= BRICK;
   if(reader.read_bool("ice", value) && value)
@@ -144,15 +146,25 @@ Tile::read(LispReader& reader)
     attributes |= GOAL;
 
   reader.read_int("data", data);
-  reader.read_int("anim-speed", anim_speed);
+  reader.read_float("anim-fps", anim_fps);
   reader.read_int("next-tile", next_tile);
 
-  // FIXME: make images and editor_images a sprite
+  if(reader.read_int("slope-type", data)) {
+    attributes |= SOLID | SLOPE;
+  }
+
   images        = create_surfaces(reader.read_lisp("images"));
   editor_images = create_surfaces(reader.read_lisp("editor-images"));
-
-  return id;
 }
 
-/* EOF */
+void
+Tile::draw(DrawingContext& context, const Vector& pos, int layer) const
+{
+  if(images.size() > 1) {
+    size_t frame = size_t(global_time * anim_fps) % images.size();
+    context.draw_surface(images[frame], pos, layer);
+  } else if (images.size() == 1) {
+    context.draw_surface(images[0], pos, layer);
+  }
+}