Added support for silver's Benjamin font.

[supertux.git] / src / tile.cpp

diff --git a/src/tile.cpp b/src/tile.cpp
index 9d11a8f..116f185 100644 (file)
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -23,16 +23,50 @@
 #include "assert.h"
 
 TileManager* TileManager::instance_  = 0;
-std::vector<TileGroup>* TileManager::tilegroups_  = 0;
+std::set<TileGroup>* TileManager::tilegroups_  = 0;
+
+Tile::Tile()
+{
+}
+
+Tile::~Tile()
+{
+  for(std::vector<Surface*>::iterator i = images.begin(); i != images.end();
+      ++i) {
+    delete *i;
+  }
+  for(std::vector<Surface*>::iterator i = editor_images.begin();
+      i != editor_images.end(); ++i) {
+    delete *i;                                                                
+  }
+}
+
+//---------------------------------------------------------------------------
 
 TileManager::TileManager()
 {
-  std::string filename = datadir +  "images/tilesets/supertux.stgt";
+  std::string filename = datadir + "/images/tilesets/supertux.stgt";
   load_tileset(filename);
 }
 
+TileManager::~TileManager()
+{
+  for(std::vector<Tile*>::iterator i = tiles.begin(); i != tiles.end(); ++i) {
+    delete *i;                                                                  
+  }
+}
+
 void TileManager::load_tileset(std::string filename)
 {
+  if(filename == current_tileset)
+    return;
+  
+  // free old tiles
+  for(std::vector<Tile*>::iterator i = tiles.begin(); i != tiles.end(); ++i) {
+    delete *i;
+  }
+  tiles.clear();
+ 
   lisp_object_t* root_obj = lisp_read_from_file(filename);
 
   if (!root_obj)
@@ -49,7 +83,7 @@ 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;
@@ -59,6 +93,7 @@ void TileManager::load_tileset(std::string filename)
               tile->water   = false;
               tile->fullbox = false;
               tile->distro  = false;
+              tile->goal    = false;
               tile->data    = 0;
               tile->next_tile  = 0;
               tile->anim_speed = 25;
@@ -71,11 +106,12 @@ void TileManager::load_tileset(std::string filename)
               reader.read_bool("water",     &tile->water);
               reader.read_bool("fullbox",   &tile->fullbox);
               reader.read_bool("distro",    &tile->distro);
+              reader.read_bool("goal",      &tile->goal);
               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);
+             reader.read_string_vector("editor-images", &tile->editor_filenames);
 
               for(std::vector<std::string>::iterator it = tile->
                   filenames.begin();
@@ -85,17 +121,17 @@ void TileManager::load_tileset(std::string filename)
                   Surface* cur_image;
                   tile->images.push_back(cur_image);
                   tile->images[tile->images.size()-1] = new Surface(
-                               datadir +  "images/tilesets/" + (*it),
+                               datadir +  "/images/tilesets/" + (*it),
                                USE_ALPHA);
                 }
-              for(std::vector<std::string>::iterator it = editor_filenames.begin();
-                  it != editor_filenames.end();
+              for(std::vector<std::string>::iterator it = tile->editor_filenames.begin();
+                  it != tile->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),
+                               datadir + "/images/tilesets/" + (*it),
                                USE_ALPHA);
                 }
                
@@ -110,19 +146,18 @@ void TileManager::load_tileset(std::string filename)
               LispReader reader(lisp_cdr(element));
               std::string filename;
               reader.read_string("file",  &filename);
-              filename = datadir + "images/tilesets/" + filename;
+              filename = datadir + "/images/tilesets/" + filename;
               load_tileset(filename);
             }
           else if (strcmp(lisp_symbol(lisp_car(element)), "tilegroup") == 0)
             {
               TileGroup new_;
-              if(!tilegroups_)
-                tilegroups_ = new std::vector<TileGroup>;
-              tilegroups_->push_back(new_);
               LispReader reader(lisp_cdr(element));
-              tilegroups_->back().name;
-              reader.read_string("name",  &tilegroups_->back().name);
-              reader.read_int_vector("tiles", &tilegroups_->back().tiles);
+              reader.read_string("name",  &new_.name);
+              reader.read_int_vector("tiles", &new_.tiles);          
+              if(!tilegroups_)
+                tilegroups_ = new std::set<TileGroup>;
+              tilegroups_->insert(new_).first;
             }
           else if (strcmp(lisp_symbol(lisp_car(element)), "properties") == 0)
             {
@@ -142,6 +177,9 @@ void TileManager::load_tileset(std::string filename)
     {
       assert(0);
     }
+
+  lisp_free(root_obj);
+  current_tileset = filename;
 }
 
 void
@@ -168,5 +206,29 @@ Tile::draw(float x, float y, unsigned int c, Uint8 alpha)
     }
 }
 
+void
+Tile::draw_stretched(float x, float y, int w, int h, 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_stretched(x,y,w,h, alpha);
+            }
+          else if (ptile->images.size() == 1)
+            {
+              ptile->images[0]->draw_stretched(x,y, w, h, alpha);
+            }
+          else
+            {
+              //printf("Tile not dravable %u\n", c);
+            }
+        }
+    }
+}
+
 // EOF //