converted player to new object system

[supertux.git] / src / tile.cpp

diff --git a/src/tile.cpp b/src/tile.cpp
index 7d07e43..19a514f 100644 (file)
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -23,7 +23,7 @@
 #include "assert.h"
 
 TileManager* TileManager::instance_  = 0;
-std::vector<TileGroup>* TileManager::tilegroups_  = 0;
+std::set<TileGroup>* TileManager::tilegroups_  = 0;
 
 Tile::Tile()
 {
@@ -83,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;
@@ -91,8 +91,10 @@ void TileManager::load_tileset(std::string filename)
               tile->brick   = false;
               tile->ice     = false;
               tile->water   = false;
+              tile->spike   = false;
               tile->fullbox = false;
               tile->distro  = false;
+              tile->goal    = false;
               tile->data    = 0;
               tile->next_tile  = 0;
               tile->anim_speed = 25;
@@ -103,13 +105,15 @@ void TileManager::load_tileset(std::string filename)
               reader.read_bool("brick",     &tile->brick);
               reader.read_bool("ice",       &tile->ice);
               reader.read_bool("water",     &tile->water);
+              reader.read_bool("spike",     &tile->spike);
               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();
@@ -122,8 +126,8 @@ void TileManager::load_tileset(std::string filename)
                                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;
@@ -150,13 +154,12 @@ void TileManager::load_tileset(std::string 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)
             {
@@ -205,5 +208,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 //