Enable loading levels from .zip files in config dir, e.g. from ~/.supertux2/foo.zip...

SVN-Revision: 4534

diff --git a/src/lisp/parser.cpp b/src/lisp/parser.cpp
index d108ba0..cfc30e8 100644 (file)
--- a/src/lisp/parser.cpp
+++ b/src/lisp/parser.cpp
@@ -60,7 +60,9 @@ static std::string dirname(std::string filename)
 Lisp*
 Parser::parse(const std::string& filename)
 {
-  IFileStream in(filename);
+  IFileStreambuf ins(filename);
+  std::istream in(&ins);
+
   if(!in.good()) {
     std::stringstream msg;
     msg << "Parser problem: Couldn't open file '" << filename << "'.";

diff --git a/src/world.cpp b/src/world.cpp
index 121718e..3f50e54 100644 (file)
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -106,7 +106,7 @@ World::load(const std::string& filename)
   // Level info file doesn't define any levels, so read the
   // directory to see what we can find
 
-  std::string path = basedir + "/";
+  std::string path = basedir;
   char** files = PHYSFS_enumerateFiles(path.c_str());
   if(!files) {
     log_warning << "Couldn't read subset dir '" << path << "'" << std::endl;