- fixed problem with last_menu not being able to handle menues deeper than two submenues

[supertux.git] / src / tile.cpp

diff --git a/src/tile.cpp b/src/tile.cpp
index 3ced8ef..e212d49 100644 (file)
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -10,6 +10,7 @@
 //
 //
 #include "tile.h"
+#include "scene.h"
 #include "assert.h"
 
 TileManager* TileManager::instance_  = 0;
@@ -72,9 +73,9 @@ void TileManager::load_tileset(std::string filename)
                   it != tile->filenames.end();
                   ++it)
                 {
-                  texture_type cur_image;
+                  Surface* cur_image;
                   tile->images.push_back(cur_image);
-                  texture_load(&tile->images[tile->images.size()-1],
+                  tile->images[tile->images.size()-1] = new Surface(
                                datadir +  "images/tilesets/" + (*it),
                                USE_ALPHA);
                 }
@@ -82,9 +83,9 @@ void TileManager::load_tileset(std::string filename)
                   it != editor_filenames.end();
                   ++it)
                 {
-                  texture_type cur_image;
+                  Surface* cur_image;
                   tile->editor_images.push_back(cur_image);
-                  texture_load(&tile->editor_images[tile->editor_images.size()-1],
+                  tile->editor_images[tile->editor_images.size()-1] = new Surface(
                                datadir +  "images/tilesets/" + (*it),
                                USE_ALPHA);
                 }
@@ -134,5 +135,29 @@ void TileManager::load_tileset(std::string filename)
     }
 }
 
+void
+Tile::draw(float x, float y, unsigned int c, Uint8 alpha)
+{
+  if (c != 0)
+    {
+      Tile* ptile = TileManager::instance()->get(c);
+      if(ptile)
+        {
+          if(ptile->images.size() > 1)
+            {
+              ptile->images[( ((global_frame_counter*25) / ptile->anim_speed) % (ptile->images.size()))]->draw(x,y, alpha);
+            }
+          else if (ptile->images.size() == 1)
+            {
+              ptile->images[0]->draw(x,y, alpha);
+            }
+          else
+            {
+              //printf("Tile not dravable %u\n", c);
+            }
+        }
+    }
+}
+
 // EOF //