X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Flevel.cpp;h=5aa073419bfe6e0158439ae19a099eb65669cd78;hb=2d97548e5cded4b201bbc10d6cec6232df03e9a4;hp=aad2bf95934afebefa5ed89af11222676b6ee940;hpb=3fcc45aed0cc7675b82082d139745c8130965299;p=supertux.git diff --git a/src/level.cpp b/src/level.cpp index aad2bf959..5aa073419 100644 --- a/src/level.cpp +++ b/src/level.cpp @@ -18,6 +18,8 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA // 02111-1307, USA. +#include + #include #include #include @@ -28,7 +30,6 @@ #include "app/globals.h" #include "app/setup.h" -#include "camera.h" #include "video/screen.h" #include "level.h" #include "math/physic.h" @@ -37,22 +38,24 @@ #include "tile.h" #include "utils/lispreader.h" #include "resources.h" -#include "gameobjs.h" #include "utils/lispwriter.h" -#include "tilemap.h" +#include "object/gameobjs.h" +#include "object/camera.h" +#include "object/tilemap.h" +#include "object/coin.h" using namespace std; Level::Level() - : name("noname"), author("mr. x"), time_left(500) - + : name("noname"), author("mr. x"), timelimit(500), + end_sequence_type(NONE_ENDSEQ_ANIM) { } void -Level::load(const std::string& filename) +Level::load(const std::string& filepath) { - LispReader* level = LispReader::load(filename, "supertux-level"); + LispReader* level = LispReader::load(filepath, "supertux-level"); int version = 1; level->read_int("version", version); @@ -68,16 +71,28 @@ Level::load(const std::string& filename) lisp_object_t* data = lisp_car(lisp_cdr(lisp_car(cur))); LispReader reader(lisp_cdr(lisp_car(cur))); - if(token == "name") { + if(token == "version") { + if(lisp_integer(data) > 2) { + std::cerr << "Warning: level format newer than application.\n"; + } + } else if(token == "name") { name = lisp_string(data); } else if(token == "author") { author = lisp_string(data); } else if(token == "time") { - time_left = lisp_integer(data); + timelimit = lisp_integer(data); } else if(token == "sector") { Sector* sector = new Sector; sector->parse(reader); add_sector(sector); + } else if(token == "end-sequence-animation") { + std::string endsequencename = lisp_string(data); + if(endsequencename == "fireworks") { + end_sequence_type = FIREWORKS_ENDSEQ_ANIM; + } else { + std::cout << "Unknown endsequence type: '" << endsequencename << + "'.\n"; + } } else { std::cerr << "Unknown token '" << token << "' in level file.\n"; continue; @@ -92,7 +107,7 @@ Level::load_old_format(LispReader& reader) { reader.read_string("name", name, true); reader.read_string("author", author); - reader.read_int("time", time_left); + reader.read_int("time", timelimit); Sector* sector = new Sector; sector->parse_old_format(reader); @@ -102,31 +117,36 @@ Level::load_old_format(LispReader& reader) void Level::save(const std::string& filename) { - ofstream file(filename.c_str(), ios::out); - LispWriter* writer = new LispWriter(file); - - writer->write_comment("Level made using SuperTux's built-in Level Editor"); - - writer->start_list("supertux-level"); - - int version = 2; - writer->write_int("version", version); - - writer->write_string("name", name); - writer->write_string("author", author); - writer->write_int("time", time_left); - - for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) - { - writer->start_list("sector"); - i->second->write(*writer); - writer->end_list("sector"); - } + std::string filepath = "levels/" + filename; + int last_slash = filepath.find_last_of('/'); + FileSystem::fcreatedir(filepath.substr(0,last_slash).c_str()); + filepath = st_dir + "/" + filepath; + ofstream file(filepath.c_str(), ios::out); + LispWriter* writer = new LispWriter(file); + + writer->write_comment("Level made using SuperTux's built-in Level Editor"); + + writer->start_list("supertux-level"); + + int version = 2; + writer->write_int("version", version); + + writer->write_string("name", name); + writer->write_string("author", author); + writer->write_int("time", timelimit); + writer->write_string("end-sequence-animation", + end_sequence_type == FIREWORKS_ENDSEQ_ANIM ? "fireworks" : "none"); + + for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) { + writer->start_list("sector"); + i->second->write(*writer); + writer->end_list("sector"); + } - writer->end_list("supertux-level"); + writer->end_list("supertux-level"); - delete writer; - file.close(); + delete writer; + file.close(); } Level::~Level() @@ -136,13 +156,6 @@ Level::~Level() } void -Level::do_vertical_flip() -{ - for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) - i->second->do_vertical_flip(); -} - -void Level::add_sector(Sector* sector) { sectors.insert(std::make_pair(sector->get_name(), sector)); @@ -158,6 +171,46 @@ Level::get_sector(const std::string& name) return i->second; } +Sector* +Level::get_next_sector(const Sector* sector) +{ + for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) + { + if(i->second == sector) + { + i++; + if(i == sectors.end()) + return NULL; + return i->second; + } + } + std::cerr << "Warning: Sector not found on level\n"; + return NULL; +} + +Sector* +Level::get_previous_sector(const Sector* sector) +{ + for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) + { + if(i->second == sector) + { + if(i == sectors.begin()) + return NULL; + i--; + return i->second; + } + } + std::cerr << "Warning: Sector not found on level\n"; + return NULL; +} + +int +Level::get_total_sectors() +{ +return sectors.size(); +} + int Level::get_total_badguys() { @@ -171,10 +224,14 @@ int Level::get_total_coins() { int total_coins = 0; - for(Sectors::iterator it = sectors.begin(); it != sectors.end(); ++it) - for(int x = 0; static_cast(x) < it->second->solids->get_width(); x++) - for(int y = 0; static_cast(y) < it->second->solids->get_height(); y++) - if(it->second->solids->get_tile(x,y)->attributes & Tile::COIN) - total_coins++; + for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) { + Sector* sector = i->second; + for(Sector::GameObjects::iterator o = sector->gameobjects.begin(); + o != sector->gameobjects.end(); ++o) { + Coin* coin = dynamic_cast (*o); + if(coin) + total_coins++; + } + } return total_coins; }