X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Flevel_subset.cpp;h=b7d590e30701ded2c87b6b92fe2d90b640b3ce37;hb=c3f9468882de1fd44f41ccfa7dae6d776bf306a7;hp=fb530498c00250c33012532507800eb21775e689;hpb=edaacb3651cf0560314dd008d7243be4b3b2f8c6;p=supertux.git diff --git a/src/level_subset.cpp b/src/level_subset.cpp index fb530498c..b7d590e30 100644 --- a/src/level_subset.cpp +++ b/src/level_subset.cpp @@ -17,15 +17,21 @@ // 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 #include -#include "app/setup.h" -#include "level.h" -#include "app/globals.h" -#include "video/surface.h" -#include "level_subset.h" - -using namespace SuperTux; +#include +#include +#include "level.hpp" +#include "resources.hpp" +#include "file_system.hpp" +#include "video/surface.hpp" +#include "level_subset.hpp" +#include "lisp/parser.hpp" +#include "lisp/lisp.hpp" +#include "lisp/writer.hpp" static bool has_suffix(const std::string& data, const std::string& suffix) { @@ -51,111 +57,80 @@ void LevelSubset::create(const std::string& subset_name) new_subset.name = subset_name; new_subset.title = "Unknown Title"; new_subset.description = "No description so far."; + new_subset.hide_from_contribs = false; new_subset.save(); } void LevelSubset::read_info_file(const std::string& info_file) { - lisp_object_t* root_obj = lisp_read_from_file(info_file); - lisp_object_t* cur = lisp_car(root_obj); + lisp::Parser parser; + std::auto_ptr root (parser.parse(info_file)); - if (lisp_symbol_p(cur) && strcmp(lisp_symbol(cur), "supertux-level-subset") == 0) - { - LispReader reader(lisp_cdr(root_obj)); + const lisp::Lisp* info = root->get_lisp("supertux-level-subset"); + if(!info) + throw std::runtime_error("File is not a levelsubset file"); - reader.read_string("title", title, true); - reader.read_string("description", description, true); - reader.read_string_vector("levels", levels); - } - else - { - std::cout << "LevelSubset: parse error in info file: " << info_file << std::endl; - } + hide_from_contribs = false; - lisp_free(root_obj); + info->get("title", title); + info->get("description", description); + info->get_vector("levels", levels); + info->get("hide-from-contribs", hide_from_contribs); } -void LevelSubset::load(const char* subset) +void LevelSubset::load(const std::string& subset) { name = subset; - // Check in which directory our subset is located (ie. ~/.supertux/ - // or SUPERTUX_DATADIR) - char filename[1024]; - snprintf(filename, 1024, "%s/levels/%s/", st_dir, subset); - if (access(filename, R_OK) == 0) - { - directory = filename; + std::string infofile = subset + "/info"; + try { + read_info_file(infofile); + } catch(std::exception& e) { + std::stringstream msg; + msg << "Couldn't parse info file '" << infofile << "': " << e.what(); + throw std::runtime_error(msg.str()); + } + + // test is a worldmap exists + has_worldmap = false; + std::string worldmap = subset + "/worldmap.stwm"; + if(PHYSFS_exists(worldmap.c_str())) { + has_worldmap = true; + } + + if (levels.empty()) { + // Level info file doesn't define any levels, so read the + // directory to see what we can find + + std::string path = subset + "/"; + char** files = PHYSFS_enumerateFiles(path.c_str()); + if(!files) { + std::cerr << "Warning: Couldn't read subset dir '" + << path << "'.\n"; + return; } - else - { - snprintf(filename, 1024, "%s/levels/%s/", datadir.c_str(), subset); - if (access(filename, R_OK) == 0) - directory = filename; - else - std::cout << "Error: LevelSubset: couldn't find subset: " << subset << std::endl; - } - - read_info_file(directory + "info"); - if (levels.empty()) - { // Level info file doesn't define any levels, so read the - // directory to see what we can find - std::vector files; - - snprintf(filename, 1024, "%s/levels/%s/", st_dir, subset); - if(access(filename, R_OK) == 0) - { - files = read_directory(filename); - } - else - { - snprintf(filename, 1024, "%s/levels/%s/", datadir.c_str(), subset); - files = read_directory(filename); - } - - for(std::vector::iterator i = files.begin(); i != files.end(); ++i) - { - if (has_suffix(*i, ".stl")) - levels.push_back(*i); - } + for(const char* const* filename = files; *filename != 0; ++filename) { + if(has_suffix(*filename, ".stl")) { + levels.push_back(path + *filename); + } } + PHYSFS_freeList(files); + } } void LevelSubset::save() { - FILE* fi; - std::string filename; - /* Save data file: */ - filename = "/levels/" + name + "/"; - - fcreatedir(filename.c_str()); - filename = std::string(st_dir) + "/levels/" + name + "/info"; - if(!fwriteable(filename.c_str())) - filename = datadir + "/levels/" + name + "/info"; - if(fwriteable(filename.c_str())) - { - fi = fopen(filename.c_str(), "w"); - if (fi == NULL) - { - perror(filename.c_str()); - } - - /* Write header: */ - fprintf(fi,";; SuperTux-Level-Subset\n"); - fprintf(fi,"(supertux-level-subset\n"); - - /* Save title info: */ - fprintf(fi," (title \"%s\")\n", title.c_str()); - - /* Save the description: */ - fprintf(fi," (description \"%s\")\n", description.c_str()); - - fprintf( fi,")"); - fclose(fi); - } + std::string filename = name + "/info"; + lisp::Writer writer(filename); + + writer.start_list("supertux-level-subset"); + writer.write_string("title", title); + writer.write_string("description", description); + writer.write_bool("hide-from-contribs", hide_from_contribs); + writer.end_list("supertux-level-subset"); } void @@ -168,8 +143,13 @@ std::string LevelSubset::get_level_filename(unsigned int num) { assert(num < levels.size()); + return levels[num]; +} - return directory + levels[num]; +std::string +LevelSubset::get_worldmap_filename() +{ + return std::string(name + "/worldmap.stwm"); } int @@ -177,5 +157,3 @@ LevelSubset::get_num_levels() const { return levels.size(); } - -/* EOF */