-// $Id$
-//
// SuperTux
// 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
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// 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 02111-1307, USA.
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+#include "sprite/sprite_manager.hpp"
-#include <config.h>
+#include "lisp/parser.hpp"
+#include "sprite/sprite.hpp"
+#include "util/file_system.hpp"
+#include "util/reader.hpp"
-#include <iostream>
#include <sstream>
#include <stdexcept>
-#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::SpriteManager()
+SpriteManager::SpriteManager() :
+ sprites()
{
}
}
}
-Sprite*
+SpritePtr
SpriteManager::create(const std::string& name)
{
Sprites::iterator i = sprites.find(name);
} else {
data = i->second;
}
-
- return new Sprite(*data);
+
+ return SpritePtr(new Sprite(*data));
}
SpriteData*
SpriteManager::load(const std::string& filename)
{
lisp::Parser parser;
- std::auto_ptr<lisp::Lisp> root (parser.parse(filename));
+ const lisp::Lisp* root;
+
+ try {
+ if(filename.size() >= 7 && filename.compare(filename.size() - 7, 7, ".sprite") == 0) {
+ // Sprite file
+ root = parser.parse(filename);
+ } else {
+ // Load image file directly
+ std::stringstream lisptext;
+ lisptext << "(supertux-sprite (action "
+ << "(name \"default\") "
+ << "(images \"" << FileSystem::basename(filename) << "\")))";
+
+ root = parser.parse(lisptext, "SpriteManager::load");
+ }
+ } 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) {
throw std::runtime_error(msg.str());
}
- std::auto_ptr<SpriteData> data (
- new SpriteData(sprite, FileSystem::dirname(filename)) );
+ std::unique_ptr<SpriteData> data (
+ new SpriteData(*sprite, FileSystem::dirname(filename)) );
sprites[filename] = data.release();
-
+
return sprites[filename];
}
+/* EOF */