X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Flevel.cpp;h=110b6859b6bb9c2e94f1d735afe5cd19edeb6387;hb=e6a940db5904743e8220491ce10b5107e119a44c;hp=f7906aba758d64979aca679611f6b73da3da66bd;hpb=083eeaf363c0b527b398e9257a6474c1054884ce;p=supertux.git diff --git a/src/level.cpp b/src/level.cpp index f7906aba7..110b6859b 100644 --- a/src/level.cpp +++ b/src/level.cpp @@ -17,6 +17,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA // 02111-1307, USA. +#include #include #include @@ -24,75 +25,89 @@ #include #include #include +#include +#include #include -#include "app/globals.h" -#include "app/setup.h" -#include "camera.h" -#include "video/screen.h" -#include "level.h" -#include "math/physic.h" -#include "scene.h" -#include "sector.h" -#include "tile.h" -#include "utils/lispreader.h" -#include "resources.h" -#include "gameobjs.h" -#include "utils/lispwriter.h" -#include "tilemap.h" +#include "video/screen.hpp" +#include "log.hpp" +#include "lisp/parser.hpp" +#include "lisp/lisp.hpp" +#include "lisp/list_iterator.hpp" +#include "lisp/writer.hpp" +#include "level.hpp" +#include "physic.hpp" +#include "sector.hpp" +#include "tile.hpp" +#include "resources.hpp" +#include "file_system.hpp" +#include "object/gameobjs.hpp" +#include "object/camera.hpp" +#include "object/tilemap.hpp" +#include "object/coin.hpp" + +// test +#include "flip_level_transformer.hpp" using namespace std; Level::Level() - : name("noname"), author("mr. x"), time_left(500) - + : name("noname"), author("Mr. X") { } void -Level::load(const std::string& filename) +Level::load(const std::string& filepath) { - LispReader* level = LispReader::load(filename, "supertux-level"); - - int version = 1; - level->read_int("version", version); - if(version == 1) { - load_old_format(*level); - delete level; - return; - } + try { + lisp::Parser parser; + std::auto_ptr root (parser.parse(filepath)); + + const lisp::Lisp* level = root->get_lisp("supertux-level"); + if(!level) + throw std::runtime_error("file is not a supertux-level file."); + + int version = 1; + level->get("version", version); + if(version == 1) { + load_old_format(*level); + return; + } - for(lisp_object_t* cur = level->get_lisp(); !lisp_nil_p(cur); - cur = lisp_cdr(cur)) { - std::string token = lisp_symbol(lisp_car(lisp_car(cur))); - lisp_object_t* data = lisp_car(lisp_cdr(lisp_car(cur))); - LispReader reader(lisp_cdr(lisp_car(cur))); - - if(token == "name") { - name = lisp_string(data); - } else if(token == "author") { - author = lisp_string(data); - } else if(token == "time") { - time_left = lisp_integer(data); - } else if(token == "sector") { - Sector* sector = new Sector; - sector->parse(reader); - add_sector(sector); - } else { - std::cerr << "Unknown token '" << token << "' in level file.\n"; - continue; + lisp::ListIterator iter(level); + while(iter.next()) { + const std::string& token = iter.item(); + if(token == "version") { + iter.value()->get(version); + if(version > 2) { + log_warning << "level format newer than application" << std::endl; + } + } else if(token == "name") { + iter.value()->get(name); + } else if(token == "author") { + iter.value()->get(author); + } else if(token == "sector") { + Sector* sector = new Sector; + sector->parse(*(iter.lisp())); + add_sector(sector); + } else { + log_warning << "Unknown token '" << token << "' in level file" << std::endl; + continue; + } } + + } catch(std::exception& e) { + std::stringstream msg; + msg << "Problem when reading level '" << filepath << "': " << e.what(); + throw std::runtime_error(msg.str()); } - - delete level; } void -Level::load_old_format(LispReader& reader) +Level::load_old_format(const lisp::Lisp& reader) { - reader.read_string("name", name, true); - reader.read_string("author", author); - reader.read_int("time", time_left); + reader.get("name", name); + reader.get("author", author); Sector* sector = new Sector; sector->parse_old_format(reader); @@ -102,100 +117,68 @@ 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); + lisp::Writer* writer = new lisp::Writer(filename); - writer->write_comment("Level made using SuperTux's built-in Level Editor"); + writer->write_comment("Level made using SuperTux's built-in Level Editor"); - writer->start_list("supertux-level"); + writer->start_list("supertux-level"); - int version = 2; - writer->write_int("version", version); + int version = 2; + writer->write_int("version", version); - writer->write_string("name", name); - writer->write_string("author", author); - writer->write_int("time", time_left); + writer->write_string("name", name, true); + writer->write_string("author", author); - for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) - { - writer->start_list("sector"); - i->second->write(*writer); - writer->end_list("sector"); - } + for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) { + Sector* sector = *i; + writer->start_list("sector"); + sector->write(*writer); + writer->end_list("sector"); + } - writer->end_list("supertux-level"); + writer->end_list("supertux-level"); - delete writer; - file.close(); + delete writer; } Level::~Level() { for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) - delete i->second; -} - -void -Level::do_vertical_flip() -{ - for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) - i->second->do_vertical_flip(); + delete *i; } void Level::add_sector(Sector* sector) { - sectors.insert(std::make_pair(sector->get_name(), sector)); + Sector* test = get_sector(sector->get_name()); + if(test != 0) { + throw std::runtime_error("Trying to add 2 sectors with same name"); + } + sectors.push_back(sector); } Sector* Level::get_sector(const std::string& name) { - Sectors::iterator i = sectors.find(name); - if(i == sectors.end()) - return 0; + for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) { + Sector* sector = *i; + if(sector->get_name() == name) + return sector; + } - return i->second; + return 0; } -Sector* -Level::get_next_sector(const Sector* sector) +size_t +Level::get_sector_count() { - 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; + return sectors.size(); } Sector* -Level::get_previous_sector(const Sector* sector) +Level::get_sector(size_t num) { - 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(); + return sectors.at(num); } int @@ -203,18 +186,24 @@ Level::get_total_badguys() { int total_badguys = 0; for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) - total_badguys += i->second->get_total_badguys(); + total_badguys += (*i)->get_total_badguys(); return total_badguys; } int Level::get_total_coins() { + // FIXME not really correct as coins can also be inside blocks... 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; + 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; } +