X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Flevel.cpp;h=8e572a05ec9f5dcfcb88e0ef78e0fb4a3c402712;hb=6f988a2dfbe4de1096a5ca6a4b30e7fc5355316c;hp=6960828e6d49430c31ae88499263ff1dd3664313;hpb=6f801c22d97251799740317fb1d0caf2e744b321;p=supertux.git diff --git a/src/level.cpp b/src/level.cpp index 6960828e6..8e572a05e 100644 --- a/src/level.cpp +++ b/src/level.cpp @@ -17,7 +17,6 @@ // 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 @@ -26,22 +25,27 @@ #include #include #include +#include +#include #include #include "app/globals.h" #include "app/setup.h" #include "video/screen.h" +#include "lisp/parser.h" +#include "lisp/lisp.h" +#include "lisp/list_iterator.h" +#include "lisp/writer.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 "utils/lispwriter.h" #include "object/gameobjs.h" #include "object/camera.h" #include "object/tilemap.h" +#include "object/coin.h" using namespace std; @@ -54,59 +58,66 @@ Level::Level() void Level::load(const std::string& filepath) { - LispReader* level = LispReader::load(filepath, "supertux-level"); - - int version = 1; - level->read_int("version", version); - if(version == 1) { - load_old_format(*level); - delete 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))); + 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; + } - 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") { - 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; + lisp::ListIterator iter(level); + while(iter.next()) { + const std::string& token = iter.item(); + if(token == "version") { + iter.value()->get(version); + if(version > 2) { + std::cerr << "Warning: level format newer than application.\n"; + } + } else if(token == "name") { + iter.value()->get(name); + } else if(token == "author") { + iter.value()->get(author); + } else if(token == "time") { + iter.value()->get(timelimit); + } else if(token == "sector") { + Sector* sector = new Sector; + sector->parse(*(iter.lisp())); + add_sector(sector); + } else if(token == "end-sequence-animation") { + std::string endsequencename; + iter.value()->get(endsequencename); + if(endsequencename == "fireworks") { + end_sequence_type = FIREWORKS_ENDSEQ_ANIM; + } else { + std::cout << "Unknown endsequence type: '" << endsequencename << + "'.\n"; + } } else { - std::cout << "Unknown endsequence type: '" << endsequencename << - "'.\n"; + std::cerr << "Unknown token '" << token << "' in level file.\n"; + continue; } - } else { - std::cerr << "Unknown token '" << token << "' in level file.\n"; - 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", timelimit); + reader.get("name", name); + reader.get("author", author); + reader.get("time", timelimit); Sector* sector = new Sector; sector->parse_old_format(reader); @@ -121,7 +132,7 @@ Level::save(const std::string& filename) 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); + lisp::Writer* writer = new lisp::Writer(file); writer->write_comment("Level made using SuperTux's built-in Level Editor"); @@ -130,7 +141,7 @@ Level::save(const std::string& filename) int version = 2; writer->write_int("version", version); - writer->write_string("name", name); + writer->write_string("name", name, true); writer->write_string("author", author); writer->write_int("time", timelimit); writer->write_string("end-sequence-animation", @@ -155,15 +166,6 @@ Level::~Level() } void -Level::do_vertical_flip() -{ -#if 0 - for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) - i->second->do_vertical_flip(); -#endif -} - -void Level::add_sector(Sector* sector) { sectors.insert(std::make_pair(sector->get_name(), sector)); @@ -233,18 +235,13 @@ Level::get_total_coins() { int total_coins = 0; for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) { - TileMap* solids = i->second->solids; - assert(solids != 0); - for(size_t x = 0; x < solids->get_width(); ++x) - for(size_t y = 0; y < solids->get_height(); ++y) { - const Tile* tile = solids->get_tile(x, y); - if(tile == 0) { - std::cerr << "Invalid tile in sector '" << i->first << "'.\n"; - continue; - } - if(tile->attributes & Tile::COIN) - total_coins++; - } + 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; }