Fixing SuperTux crashes when compiled on Mac OS X 10.9

[supertux.git] / src / supertux / world.cpp

diff --git a/src/supertux/world.cpp b/src/supertux/world.cpp
index 60fe209..d1fe91e 100644 (file)
--- a/src/supertux/world.cpp
+++ b/src/supertux/world.cpp
@@ -18,7 +18,7 @@
 
 #include "lisp/parser.hpp"
 #include "lisp/writer.hpp"
-#include "physfs/ifile_stream.hpp"
+#include "physfs/ifile_streambuf.hpp"
 #include "scripting/serialize.hpp"
 #include "scripting/squirrel_util.hpp"
 #include "supertux/globals.hpp"
@@ -143,7 +143,8 @@ World::run()
 
   std::string filename = basedir + "/world.nut";
   try {
-    IFileStream in(filename);
+    IFileStreambuf ins(filename);
+    std::istream in(&ins);
 
     sq_release(global_vm, &world_thread);
     world_thread = create_thread(global_vm);
@@ -197,7 +198,7 @@ World::load_state()
 {
   using namespace scripting;
 
-  if(PHYSFS_exists(savegame_filename)) {
+  if(PHYSFS_exists(savegame_filename.c_str())) {
     try {
       lisp::Parser parser;
       const lisp::Lisp* root = parser.parse(savegame_filename);