X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsprite%2Fsprite_manager.cpp;h=f1de683d85027601f3c40dc7b78b034dc2ca380a;hb=708a1fe72ec39e9fb35100c60e0fccc2d06a2481;hp=4a11b25bc4f8bf0c5af7062ebfe3365400c3b466;hpb=c0093d25093395cb62fc2526ab42be65a9f015b8;p=supertux.git

diff --git a/src/sprite/sprite_manager.cpp b/src/sprite/sprite_manager.cpp
index 4a11b25bc..f1de683d8 100644
--- a/src/sprite/sprite_manager.cpp
+++ b/src/sprite/sprite_manager.cpp
@@ -1,7 +1,7 @@
 //  $Id$
 //
 //  SuperTux
-//  Copyright (C) 2004 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -16,22 +16,26 @@
 //  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  02111-1307, USA.
+
 #include <config.h>
 
 #include <iostream>
 #include <sstream>
 #include <stdexcept>
 
-#include "sprite_manager.h"
-#include "sprite_data.h"
-#include "sprite.h"
-#include "lisp/lisp.h"
-#include "lisp/parser.h"
-#include "lisp/list_iterator.h"
+#include "sprite_manager.hpp"
+#include "sprite_data.hpp"
+#include "sprite.hpp"
+#include "lisp/lisp.hpp"
+#include "lisp/parser.hpp"
+#include "lisp/list_iterator.hpp"
+#include "file_system.hpp"
+#include "log.hpp"
+
+SpriteManager* sprite_manager = NULL;
 
-SpriteManager::SpriteManager(const std::string& filename)
+SpriteManager::SpriteManager()
 {
-  load_resfile(filename);
 }
 
 SpriteManager::~SpriteManager()
@@ -41,52 +45,51 @@ SpriteManager::~SpriteManager()
   }
 }
 
-void
-SpriteManager::load_resfile(const std::string& filename)
+Sprite*
+SpriteManager::create(const std::string& name)
 {
-  lisp::Parser parser;
-  try {
-    std::auto_ptr<lisp::Lisp> root (parser.parse(filename));
+  Sprites::iterator i = sprites.find(name);
+  SpriteData* data;
+  if(i == sprites.end()) {
+    // try loading the spritefile
+    data = load(name);
+    if(data == NULL) {
+      std::stringstream msg;
+      msg << "Sprite '" << name << "' not found.";
+      throw std::runtime_error(msg.str());
+    }
+  } else {
+    data = i->second;
+  }
 
-    const lisp::Lisp* resources = root->get_lisp("supertux-resources");
-    if(!resources)
-      throw std::runtime_error("file is not a supertux-resources files");
+  return new Sprite(*data);
+}
 
-    lisp::ListIterator iter(resources);
-    while(iter.next()) {
-      if(iter.item() == "sprite") {
-        SpriteData* spritedata = new SpriteData(iter.lisp());
+SpriteData*
+SpriteManager::load(const std::string& filename)
+{
+  lisp::Parser parser;
+  const lisp::Lisp* root;
 
-        Sprites::iterator i = sprites.find(spritedata->get_name());
-        if (i == sprites.end()) {
-          sprites[spritedata->get_name()] = spritedata;
-        } else {
-          delete i->second;
-          i->second = spritedata;
-          std::cout << "Warning: dulpicate entry: '" << spritedata->get_name()
-            << "' in spritefile." << std::endl;
-        }
-      } else {
-        std::cout << "SpriteManager: Unknown tag '" << iter.item() 
-          << "' in spritefile.\n";
-      }
-    }
-  } catch(std::exception& e) {
-    std::stringstream msg;
-    msg << "Couldn't load file '" << filename << "': " << e.what() << "\n";
+  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());
   }
-}
 
-Sprite*
-SpriteManager::create(const std::string& name)
-{
-  Sprites::iterator i = sprites.find(name);
-  if(i == sprites.end()) {
-    std::stringstream msg;
-    msg << "Sprite '" << name << "' not found.";
+  const lisp::Lisp* sprite = root->get_lisp("supertux-sprite");
+  if(!sprite) {
+    std::ostringstream msg;
+    msg << "'" << filename << "' is not a supertux-sprite file";
     throw std::runtime_error(msg.str());
   }
-  return new Sprite(*i->second);
-}
 
+  std::auto_ptr<SpriteData> data (
+      new SpriteData(sprite, FileSystem::dirname(filename)) );
+  sprites[filename] = data.release();
+
+  return sprites[filename];
+}