// 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 "../utils/lispreader.h"
-#include "../special/sprite_manager.h"
+#include "utils/lispreader.h"
+#include "sprite_manager.h"
+#include "sprite_data.h"
+#include "sprite.h"
-using namespace SuperTux;
+namespace SuperTux
+{
SpriteManager::SpriteManager(const std::string& filename)
{
SpriteManager::~SpriteManager()
{
- for(std::map<std::string, Sprite*>::iterator i = sprites.begin();
- i != sprites.end(); ++i) {
+ for(Sprites::iterator i = sprites.begin(); i != sprites.end(); ++i) {
delete i->second;
}
}
return;
cur = lisp_cdr(cur);
- while(cur)
- {
- lisp_object_t* el = lisp_car(cur);
-
- if (strcmp(lisp_symbol(lisp_car(el)), "sprite") == 0)
- {
- Sprite* sprite = new Sprite(lisp_cdr(el));
-
- Sprites::iterator i = sprites.find(sprite->get_name());
- if (i == sprites.end())
- {
- sprites[sprite->get_name()] = sprite;
- }
- else
- {
- delete i->second;
- i->second = sprite;
- std::cout << "Warning: dulpicate entry: '" << sprite->get_name() << "'" << std::endl;
- }
- }
- else
- {
- std::cout << "SpriteManager: Unknown tag" << std::endl;
- }
-
- cur = lisp_cdr(cur);
+ while(cur) {
+ lisp_object_t* el = lisp_car(cur);
+
+ if (strcmp(lisp_symbol(lisp_car(el)), "sprite") == 0) {
+ SpriteData* spritedata = new SpriteData(lisp_cdr(el));
+
+ 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 in spritefile.\n";
}
+ cur = lisp_cdr(cur);
+ }
+
lisp_free(root_obj);
}
Sprite*
-SpriteManager::load(const std::string& name)
+SpriteManager::create(const std::string& name)
{
Sprites::iterator i = sprites.find(name);
- if (i == sprites.end())
- {
- std::cerr << "Warning: Sprite '" << name << "' not found" << std::endl;
- return 0;
- }
- return i->second;
+ if(i == sprites.end()) {
+ std::stringstream msg;
+ msg << "Sprite '" << name << "' not found.";
+ throw std::runtime_error(msg.str());
+ }
+ return new Sprite(*i->second);
+}
+
}
-/* EOF */