#include "assert.h"
TileManager* TileManager::instance_ = 0;
-std::vector<TileGroup>* TileManager::tilegroups_ = 0;
+std::set<TileGroup>* TileManager::tilegroups_ = 0;
Tile::Tile()
{
if (strcmp(lisp_symbol(lisp_car(element)), "tile") == 0)
{
- std::vector<std::string> editor_filenames;
+
Tile* tile = new Tile;
tile->id = -1;
tile->water = false;
tile->fullbox = false;
tile->distro = false;
+ tile->goal = false;
tile->data = 0;
tile->next_tile = 0;
tile->anim_speed = 25;
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();
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;
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)
{
}
}
+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 //