projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
include fixes from ohnobinki, video_systems.cpp should fall back to SDL now if GL...
[supertux.git]
/
src
/
sprite
/
sprite_manager.cpp
diff --git
a/src/sprite/sprite_manager.cpp
b/src/sprite/sprite_manager.cpp
index
8422fda
..
72d282c
100644
(file)
--- a/
src/sprite/sprite_manager.cpp
+++ b/
src/sprite/sprite_manager.cpp
@@
-21,6
+21,10
@@
#include "util/file_system.hpp"
#include "util/reader.hpp"
#include "util/file_system.hpp"
#include "util/reader.hpp"
+#include <sstream>
+#include <stdexcept>
+
+
SpriteManager::SpriteManager() :
sprites()
{
SpriteManager::SpriteManager() :
sprites()
{
@@
-33,7
+37,7
@@
SpriteManager::~SpriteManager()
}
}
}
}
-std::auto_ptr<Sprite>
+SpritePtr
SpriteManager::create(const std::string& name)
{
Sprites::iterator i = sprites.find(name);
SpriteManager::create(const std::string& name)
{
Sprites::iterator i = sprites.find(name);
@@
-50,7
+54,7
@@
SpriteManager::create(const std::string& name)
data = i->second;
}
data = i->second;
}
- return
std::auto_ptr<Sprite>
(new Sprite(*data));
+ return
SpritePtr
(new Sprite(*data));
}
SpriteData*
}
SpriteData*