diff options
Diffstat (limited to 'src/resources')
-rw-r--r-- | src/resources/resourcemanager.cpp | 4 | ||||
-rw-r--r-- | src/resources/resourcemanager.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index 2c4bc0f95..b88c4dbb5 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -573,7 +573,7 @@ struct SubImageLoader } }; -SubImage *ResourceManager::getSubImage(Image *parent, int x, int y, +Image *ResourceManager::getSubImage(Image *parent, int x, int y, int width, int height) { if (!parent) @@ -584,7 +584,7 @@ SubImage *ResourceManager::getSubImage(Image *parent, int x, int y, std::stringstream ss; ss << parent->getIdPath() << ",[" << x << "," << y << "," << width << "x" << height << "]"; - return reinterpret_cast<SubImage*>(get(ss.str(), SubImageLoader::load, &rl)); + return static_cast<Image*>(get(ss.str(), SubImageLoader::load, &rl)); } struct SpriteDefLoader diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h index b4892227e..7a1e517c0 100644 --- a/src/resources/resourcemanager.h +++ b/src/resources/resourcemanager.h @@ -38,7 +38,6 @@ class ImageSet; class Music; class Resource; class SoundEffect; -class SubImage; class SpriteDef; struct SDL_Surface; @@ -203,7 +202,7 @@ class ResourceManager */ ImageSet *getImageSet(const std::string &imagePath, int w, int h); - SubImage *getSubImage(Image *parent, int x, int y, int width, int height); + Image *getSubImage(Image *parent, int x, int y, int width, int height); /** * Creates a sprite definition based on a given path and the supplied |