diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-04-28 20:18:27 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-04-28 20:26:01 +0300 |
| commit | fdfd38278cba5fa37d203d0d29b4981e400a529a (patch) | |
| tree | fbad0c8bcdb2f6c9885d30e9d816761b6e89a0e7 /src/resources/atlas | |
| parent | dda65b8fb01ac399af8fa44085db3cd9ab6cef2b (diff) | |
| download | manaplus-fdfd38278cba5fa37d203d0d29b4981e400a529a.tar.gz manaplus-fdfd38278cba5fa37d203d0d29b4981e400a529a.tar.bz2 manaplus-fdfd38278cba5fa37d203d0d29b4981e400a529a.tar.xz manaplus-fdfd38278cba5fa37d203d0d29b4981e400a529a.zip | |
Fix overload virtual warning with SDL2.
Diffstat (limited to 'src/resources/atlas')
| -rw-r--r-- | src/resources/atlas/atlasmanager.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/resources/atlas/atlasmanager.cpp b/src/resources/atlas/atlasmanager.cpp index 8b4eb4187..03d0b40fd 100644 --- a/src/resources/atlas/atlasmanager.cpp +++ b/src/resources/atlas/atlasmanager.cpp @@ -257,7 +257,7 @@ SDL_Surface *AtlasManager::createSDLAtlas(TextureAtlas *const atlas) } BLOCK_END("AtlasManager::createSDLAtlas create surface") - Image *image = imageHelper->load(surface); + Image *image = imageHelper->loadSurface(surface); // drawing SDL images to surface FOR_EACH (std::vector<AtlasItem*>::iterator, it, atlas->items) @@ -282,7 +282,8 @@ void AtlasManager::convertAtlas(TextureAtlas *const atlas) if (oldImage->mSDLSurface) { - atlas->atlasImage = imageHelper->load(atlas->atlasImage->mSDLSurface); + atlas->atlasImage = imageHelper->loadSurface( + atlas->atlasImage->mSDLSurface); oldImage->decRef(); } |