X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworldmap%2Flevel.cpp;h=59984ffad2df8b21ec2a7ddb21df24d0d4cd36cd;hb=7e15c4f871809033278711a6e9327616da00c4c9;hp=fbc6b0bdbe5efda18dcffcea27909283346fc875;hpb=ef146ea92ea53c84903cc5ba624520fb7b288522;p=supertux.git diff --git a/src/worldmap/level.cpp b/src/worldmap/level.cpp index fbc6b0bdb..59984ffad 100644 --- a/src/worldmap/level.cpp +++ b/src/worldmap/level.cpp @@ -32,21 +32,23 @@ namespace WorldMapNS { LevelTile::LevelTile(const std::string& basedir, const lisp::Lisp* lisp) - : solved(false), auto_path(true), basedir(basedir), picture_cached(false), picture(0) + : solved(false), auto_play(false), basedir(basedir), picture_cached(false), + picture(0) { + lisp->get("name", name); lisp->get("x", pos.x); lisp->get("y", pos.y); - + lisp->get("auto-play", auto_play); + std::string spritefile = "images/worldmap/common/leveldot.sprite"; lisp->get("sprite", spritefile); sprite.reset(sprite_manager->create(spritefile)); lisp->get("extro-script", extro_script); - lisp->get("name", name); - + if (!PHYSFS_exists((basedir + name).c_str())) { - log_warning << "level file '" << name + log_warning << "level file '" << name << "' does not exist and will not be added to the worldmap" << std::endl; return; } @@ -75,7 +77,7 @@ LevelTile::get_picture() picture_cached = true; std::string fname = FileSystem::strip_extension(basedir + name)+".jpg"; if (!PHYSFS_exists(fname.c_str())) { - return 0; + return 0; } picture = new Surface(fname); return picture;