Added inverse functions for speed. Might be usefull for someone that wants to make...

[supertux.git] / src / tile.cpp

diff --git a/src/tile.cpp b/src/tile.cpp
index 09a6f88..e212d49 100644 (file)
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -1,7 +1,7 @@
 //
 // C++ Implementation: tile
 //
-// Description: 
+// Description:
 //
 //
 // Author: Tobias Glaesser <tobi.web@gmx.de>, (C) 2004
@@ -10,20 +10,22 @@
 //
 //
 #include "tile.h"
+#include "scene.h"
 #include "assert.h"
 
 TileManager* TileManager::instance_  = 0;
+std::vector<TileGroup>* TileManager::tilegroups_  = 0;
 
 TileManager::TileManager()
 {
-  std::string filename = datadir +  "images/tilesets/supertux.stgt"; 
+  std::string filename = datadir +  "images/tilesets/supertux.stgt";
   load_tileset(filename);
 }
 
 void TileManager::load_tileset(std::string filename)
 {
   lisp_object_t* root_obj = lisp_read_from_file(filename);
-  
+
   if (!root_obj)
     st_abort("Couldn't load file", filename);
 
@@ -38,59 +40,87 @@ void TileManager::load_tileset(std::string filename)
 
           if (strcmp(lisp_symbol(lisp_car(element)), "tile") == 0)
             {
-              int id = 0;
-              std::vector<std::string> filenames;
-
-              Tile* tile = new Tile;             
-              tile->solid = false;
-             tile->brick = false;
-             tile->ice = false;          
-             tile->fullbox = false;          
-              tile->alpha = 0;
-              tile->distro = 0;
-              tile->data  = 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;
+              tile->next_tile  = 0;
               tile->anim_speed = 25;
-  
+
               LispReader reader(lisp_cdr(element));
-              reader.read_int("id",  &id);
-              reader.read_bool("solid", &tile->solid);
-              reader.read_bool("brick", &tile->brick);
-              reader.read_bool("ice", &tile->ice);        
-              reader.read_bool("fullbox", &tile->fullbox);
-              reader.read_bool("distro", &tile->distro);
-              reader.read_int("data",  (int*)&tile->data);
-              reader.read_int("alpha",  (int*)&tile->alpha);
-              reader.read_int("anim-speed",  &tile->anim_speed);
-              reader.read_string_vector("images",  &filenames);
+              assert(reader.read_int("id",  &tile->id));
+              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 = filenames.begin(); it != filenames.end(); ++it)
+              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], 
-                               datadir +  "images/tilesets/" + (*it), 
+                  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);
 
-              if (id+tileset_id >= int(tiles.size()))
-                tiles.resize(id+tileset_id+1);
-
-              tiles[id+tileset_id] = tile;
+              tiles[tile->id + tileset_id] = tile;
             }
-         else if (strcmp(lisp_symbol(lisp_car(element)), "tileset") == 0)
+          else if (strcmp(lisp_symbol(lisp_car(element)), "tileset") == 0)
             {
-             LispReader reader(lisp_cdr(element));
-             std::string filename;
+              LispReader reader(lisp_cdr(element));
+              std::string filename;
               reader.read_string("file",  &filename);
-             filename = datadir + "images/tilesets/" + filename; 
-             load_tileset(filename);
-           }
-         else if (strcmp(lisp_symbol(lisp_car(element)), "properties") == 0)
+              filename = datadir + "images/tilesets/" + filename;
+              load_tileset(filename);
+            }
+          else if (strcmp(lisp_symbol(lisp_car(element)), "tilegroup") == 0)
             {
-             LispReader reader(lisp_cdr(element));
+              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);
+            }
+          else if (strcmp(lisp_symbol(lisp_car(element)), "properties") == 0)
+            {
+              LispReader reader(lisp_cdr(element));
               reader.read_int("id",  &tileset_id);
-             tileset_id *= 1000;
-           }
+              tileset_id *= 1000;
+            }
           else
             {
               puts("Unhandled symbol");
@@ -105,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 //