// $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
// 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 "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()
{
-#ifdef DEBUG
- Uint32 ticks = SDL_GetTicks();
-#endif
- load_resfile(filename);
-#ifdef DEBUG
- printf("Loaded sprites in %f seconds\n", (SDL_GetTicks() - ticks) / 1000.0f);
-#endif
}
SpriteManager::~SpriteManager()
}
}
-void
-SpriteManager::load_resfile(const std::string& filename)
-{
- lisp::Parser parser;
- try {
- std::auto_ptr<lisp::Lisp> root (parser.parse(filename));
-
- const lisp::Lisp* resources = root->get_lisp("supertux-resources");
- if(!resources)
- throw std::runtime_error("file is not a supertux-resources files");
-
- lisp::ListIterator iter(resources);
- while(iter.next()) {
- if(iter.item() == "sprite") {
- SpriteData* spritedata = new SpriteData(iter.lisp(), "images/");
-
- 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";
- throw std::runtime_error(msg.str());
- }
-}
-
Sprite*
SpriteManager::create(const std::string& name)
{
} else {
data = i->second;
}
-
+
return new Sprite(*data);
}
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) {
std::auto_ptr<SpriteData> data (
new SpriteData(sprite, FileSystem::dirname(filename)) );
sprites[filename] = data.release();
-
+
return sprites[filename];
}
-