diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-08-13 10:20:19 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-08-13 10:20:19 +0000 |
commit | d3385829ca6f7d52e21706b25b14fe1083cfe984 (patch) | |
tree | aea368b2434a49864b33183f95b6aae36abef3b7 /src/resources/resourcemanager.h | |
parent | 7d287027babe615e01ddcf20edc1057f7d778c58 (diff) | |
download | mana-client-d3385829ca6f7d52e21706b25b14fe1083cfe984.tar.gz mana-client-d3385829ca6f7d52e21706b25b14fe1083cfe984.tar.bz2 mana-client-d3385829ca6f7d52e21706b25b14fe1083cfe984.tar.xz mana-client-d3385829ca6f7d52e21706b25b14fe1083cfe984.zip |
Merged Guichan 0.5.0 support from guichan-0.5.0 branch, plus several updates
from the 0.1.0 branch.
Diffstat (limited to 'src/resources/resourcemanager.h')
-rw-r--r-- | src/resources/resourcemanager.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h index f254a8b4..0086b167 100644 --- a/src/resources/resourcemanager.h +++ b/src/resources/resourcemanager.h @@ -27,6 +27,7 @@ #include <iosfwd> #include <map> #include <vector> +#include <SDL.h> class Resource; class Image; @@ -164,6 +165,13 @@ class ResourceManager loadTextFile(const std::string &fileName); /** + * Loads the given filename as an SDL surface. The returned surface is + * expected to be freed by the caller using SDL_FreeSurface. + */ + SDL_Surface* + loadSDLSurface(const std::string& filename); + + /** * Returns an instance of the class, creating one if it does not * already exist. */ |