X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworld.cpp;h=26ace8b5db47d50fc752e14aa35962e409d11933;hb=fb8cef6efacc0dff5faaff6dc4aa638289285099;hp=3f50e543c78e8d92743be1578f73cc471ee80349;hpb=5bdb8c3fe5670b07f1e39c5b2a13e04ec19b7adb;p=supertux.git

diff --git a/src/world.cpp b/src/world.cpp
index 3f50e543c..26ace8b5d 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -33,6 +33,7 @@
 #include "log.hpp"
 #include "worldmap/worldmap.hpp"
 #include "mainloop.hpp"
+#include "player_status.hpp"
 
 static bool has_suffix(const std::string& data, const std::string& suffix)
 {
@@ -86,7 +87,7 @@ World::load(const std::string& filename)
   basedir = FileSystem::dirname(filename);
 
   lisp::Parser parser;
-  std::auto_ptr<lisp::Lisp> root (parser.parse(filename));
+  const lisp::Lisp* root = parser.parse(filename);
 
   const lisp::Lisp* info = root->get_lisp("supertux-world");
   if(info == NULL)
@@ -128,7 +129,7 @@ World::run()
 
   current_ = this;
 
-  // create new squirrel table for persisten game state
+  // create new squirrel table for persistent game state
   HSQUIRRELVM vm = Scripting::global_vm;
 
   sq_pushroottable(vm);
@@ -147,7 +148,7 @@ World::run()
     sq_release(global_vm, &world_thread);
     world_thread = create_thread(global_vm);
     compile_and_run(object_to_vm(world_thread), in, filename);
-  } catch(std::exception& e) {
+  } catch(std::exception& ) {
     // fallback: try to load worldmap worldmap.stwm
     using namespace WorldMapNS;
     main_loop->push_screen(new WorldMap(basedir + "worldmap.stwm"));
@@ -198,7 +199,7 @@ World::load_state()
 
   try {
     lisp::Parser parser;
-    std::auto_ptr<lisp::Lisp> root (parser.parse(savegame_filename));
+    const lisp::Lisp* root = parser.parse(savegame_filename);
 
     const lisp::Lisp* lisp = root->get_lisp("supertux-savegame");
     if(lisp == NULL)