* Fixed crasher if world doesn't have a world.nut

* Bonus island worldmaps work again

SVN-Revision: 3292

diff --git a/data/levels/bonus1/info b/data/levels/bonus1/info
index d28b7c5..1f4e8c8 100644 (file)
--- a/data/levels/bonus1/info
+++ b/data/levels/bonus1/info
@@ -2,4 +2,5 @@
 (supertux-level-subset
   (title (_ "Bonus Island I"))
   (description "Levels from the Bonus World 1")
+  (levelset #f)
 )

diff --git a/data/levels/bonus2/info b/data/levels/bonus2/info
index 578f923..88ecca0 100644 (file)
--- a/data/levels/bonus2/info
+++ b/data/levels/bonus2/info
@@ -2,4 +2,5 @@
 (supertux-level-subset
   (title (_ "Bonus Island II"))
   (description "Levels from the Bonus World 2")
+  (levelset #f)
 )

diff --git a/src/world.cpp b/src/world.cpp
index faf5c7b..71d60cf 100644 (file)
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -95,6 +95,10 @@ void
 World::run()
 {
   std::string filename = basedir + "/world.nut";
+  std::cout << filename << std::endl;
+  if (!PHYSFS_exists(filename.c_str()))
+    return;
+
   IFileStream in(filename);
 
   HSQUIRRELVM vm = script_manager->create_thread();