X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsprite%2Fsprite_manager.cpp;h=f1de683d85027601f3c40dc7b78b034dc2ca380a;hb=c3c41a343669d375aaa674c7f3ac35f08f24703e;hp=411255b54402c984405172b330c94148d0f9ce55;hpb=112f01454123c94f5627200c6819b219026f0af0;p=supertux.git

diff --git a/src/sprite/sprite_manager.cpp b/src/sprite/sprite_manager.cpp
index 411255b54..f1de683d8 100644
--- a/src/sprite/sprite_manager.cpp
+++ b/src/sprite/sprite_manager.cpp
@@ -61,7 +61,7 @@ SpriteManager::create(const std::string& name)
   } else {
     data = i->second;
   }
-  
+
   return new Sprite(*data);
 }
 
@@ -69,7 +69,16 @@ SpriteData*
 SpriteManager::load(const std::string& filename)
 {
   lisp::Parser parser;
-  std::auto_ptr<lisp::Lisp> root (parser.parse(filename));
+  const lisp::Lisp* root;
+
+  try {
+    root = parser.parse(filename);
+  } catch(const std::exception& e) {
+    std::ostringstream msg;
+    msg << "Parse error when trying to load sprite '" << filename
+        << "': " << e.what() << "\n";
+    throw std::runtime_error(msg.str());
+  }
 
   const lisp::Lisp* sprite = root->get_lisp("supertux-sprite");
   if(!sprite) {
@@ -81,7 +90,6 @@ SpriteManager::load(const std::string& filename)
   std::auto_ptr<SpriteData> data (
       new SpriteData(sprite, FileSystem::dirname(filename)) );
   sprites[filename] = data.release();
-  
+
   return sprites[filename];
 }
-