- 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 429bd16..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;
@@ -39,11 +40,14 @@ void TileManager::load_tileset(std::string filename)
 
           if (strcmp(lisp_symbol(lisp_car(element)), "tile") == 0)
             {
+             std::vector<std::string> editor_filenames;
+            
               Tile* tile = new Tile;
               tile->id      = -1;
               tile->solid   = false;
               tile->brick   = false;
               tile->ice     = false;
+              tile->water   = false;
               tile->fullbox = false;
               tile->distro  = false;
               tile->data    = 0;
@@ -55,25 +59,37 @@ void TileManager::load_tileset(std::string filename)
               reader.read_bool("solid",     &tile->solid);
               reader.read_bool("brick",     &tile->brick);
               reader.read_bool("ice",       &tile->ice);
+              reader.read_bool("water",     &tile->water);
               reader.read_bool("fullbox",   &tile->fullbox);
               reader.read_bool("distro",    &tile->distro);
               reader.read_int("data",       &tile->data);
               reader.read_int("anim-speed", &tile->anim_speed);
               reader.read_int("next-tile",  &tile->next_tile);
               reader.read_string_vector("images",  &tile->filenames);
+             reader.read_string_vector("editor-images", &editor_filenames);
 
               for(std::vector<std::string>::iterator it = tile->
                   filenames.begin();
                   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);
                 }
-
+              for(std::vector<std::string>::iterator it = editor_filenames.begin();
+                  it != editor_filenames.end();
+                  ++it)
+                {
+                  Surface* cur_image;
+                  tile->editor_images.push_back(cur_image);
+                  tile->editor_images[tile->editor_images.size()-1] = new Surface(
+                               datadir +  "images/tilesets/" + (*it),
+                               USE_ALPHA);
+                }
+               
               if (tile->id + tileset_id >= int(tiles.size())
                  )
                 tiles.resize(tile->id + tileset_id+1);
@@ -119,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 //