diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-11-21 19:43:11 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-11-21 19:43:11 +0000 |
| commit | 7c7909350565c3506f8b24645cac10f3197e1fc5 (patch) | |
| tree | 748ce81596f924d81cb7b6fdba84fe22a054e305 /src/resources/resourcemanager.h | |
| parent | 434d0bd000576b534c51f611c09eb99b3863e1c5 (diff) | |
| download | mana-7c7909350565c3506f8b24645cac10f3197e1fc5.tar.gz mana-7c7909350565c3506f8b24645cac10f3197e1fc5.tar.bz2 mana-7c7909350565c3506f8b24645cac10f3197e1fc5.tar.xz mana-7c7909350565c3506f8b24645cac10f3197e1fc5.zip | |
Merged revisions 3705-3711,3714,3718,3721-3722,3729-3731,3735,3742 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk
(dynamic recoloring of sprites and related changes)
........
r3705 | gmelquio | 2007-11-03 10:58:25 +0100 (Sat, 03 Nov 2007) | 1 line
Fixed double load of hair graphics.
........
r3706 | gmelquio | 2007-11-03 22:04:51 +0100 (Sat, 03 Nov 2007) | 1 line
Added automatic recoloring of images. Inspired by fungos' ideas (PR #41).
........
r3707 | gmelquio | 2007-11-03 22:08:21 +0100 (Sat, 03 Nov 2007) | 1 line
Experimented recoloring on scorpions.
........
r3708 | gmelquio | 2007-11-04 12:52:44 +0100 (Sun, 04 Nov 2007) | 1 line
Tightened palette handling.
........
r3709 | gmelquio | 2007-11-04 12:54:31 +0100 (Sun, 04 Nov 2007) | 1 line
Experimented with scorpions again.
........
r3710 | gmelquio | 2007-11-04 16:40:37 +0100 (Sun, 04 Nov 2007) | 1 line
Applied recoloring to hair styles.
........
r3711 | gmelquio | 2007-11-04 17:50:37 +0100 (Sun, 04 Nov 2007) | 1 line
Converted slimes to recoloring.
........
r3742 | gmelquio | 2007-11-16 14:16:00 +0100 (Fri, 16 Nov 2007) | 1 line
Sped up recoloring of transparent pixels.
........
Diffstat (limited to 'src/resources/resourcemanager.h')
| -rw-r--r-- | src/resources/resourcemanager.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h index 150b773c..c52248b1 100644 --- a/src/resources/resourcemanager.h +++ b/src/resources/resourcemanager.h @@ -24,10 +24,9 @@ #ifndef _TMW_RESOURCE_MANAGER_H #define _TMW_RESOURCE_MANAGER_H -#include <iosfwd> #include <map> +#include <string> #include <vector> -#include <SDL.h> class Resource; class Image; @@ -35,6 +34,7 @@ class Music; class SoundEffect; class ImageSet; class SpriteDef; +struct SDL_Surface; /** * A class for loading and managing resources. @@ -151,8 +151,7 @@ class ResourceManager * Creates a sprite definition based on a given path and the supplied * variant. */ - SpriteDef* - getSprite(const std::string &path, int variant = 0); + SpriteDef *getSprite(std::string const &path, int variant = 0); /** * Releases a resource, removing it from the set of loaded resources. |