yeti cleanup and death animation rework, hitbox fix ups

[supertux.git] / src / world.cpp

diff --git a/src/world.cpp b/src/world.cpp
index 85f3d9c..4d9d811 100644 (file)
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -1,5 +1,5 @@
-//  $Id: level_subset.cpp 3118 2006-03-25 17:29:08Z sommer $
-// 
+//  $Id$
+//
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
@@ -12,7 +12,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
@@ -31,7 +31,7 @@
 #include "script_manager.hpp"
 #include "scripting/wrapper_util.hpp"
 #include "scripting/serialize.hpp"
-#include "msg.hpp"
+#include "log.hpp"
 #include "worldmap.hpp"
 #include "mainloop.hpp"
 
@@ -61,6 +61,22 @@ void
 World::set_savegame_filename(const std::string& filename)
 {
   this->savegame_filename = filename;
+  // make sure the savegame directory exists
+  std::string dirname = FileSystem::dirname(filename);
+  if(!PHYSFS_exists(dirname.c_str())) {
+      if(PHYSFS_mkdir(dirname.c_str())) {
+          std::ostringstream msg;
+          msg << "Couldn't create directory for savegames '"
+              << dirname << "': " <<PHYSFS_getLastError();
+          throw std::runtime_error(msg.str());
+      }
+  }
+ 
+  if(!PHYSFS_isDirectory(dirname.c_str())) {
+      std::ostringstream msg;
+      msg << "Savegame path '" << dirname << "' is not a directory";
+      throw std::runtime_error(msg.str());
+  }
 }
 
 void
@@ -92,7 +108,7 @@ World::load(const std::string& filename)
   std::string path = basedir + "/";
   char** files = PHYSFS_enumerateFiles(path.c_str());
   if(!files) {
-    msg_warning << "Couldn't read subset dir '" << path << "'" << std::endl;
+    log_warning << "Couldn't read subset dir '" << path << "'" << std::endl;
     return;
   }
 
@@ -209,7 +225,7 @@ World::load_state()
       throw std::runtime_error("Couldn't create state table");
     sq_pop(vm, 1); 
   } catch(std::exception& e) {
-    msg_debug << "Couldn't load savegame: " << e.what() << std::endl;
+    log_debug << "Couldn't load savegame: " << e.what() << std::endl;
   }
 }