diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-08-21 23:58:06 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-08-24 21:08:15 +0300 |
| commit | bb0281c87995e11dc1cac95009a5253356d94d1a (patch) | |
| tree | e8b0a1f0f1560dd5d4308f9f7a2d48264ac0ea45 /src/resources | |
| parent | e5521effc043cdf9d781816c0d72bd17830e34f8 (diff) | |
| download | manaplus-bb0281c87995e11dc1cac95009a5253356d94d1a.tar.gz manaplus-bb0281c87995e11dc1cac95009a5253356d94d1a.tar.bz2 manaplus-bb0281c87995e11dc1cac95009a5253356d94d1a.tar.xz manaplus-bb0281c87995e11dc1cac95009a5253356d94d1a.zip | |
some SDL2 complilation fixes.
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/atlasmanager.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/resources/atlasmanager.cpp b/src/resources/atlasmanager.cpp index dd1f7aef3..f6cd23de4 100644 --- a/src/resources/atlasmanager.cpp +++ b/src/resources/atlasmanager.cpp @@ -200,6 +200,10 @@ void AtlasManager::simpleSort(const std::string &name, SDL_Surface *AtlasManager::createSDLAtlas(TextureAtlas *const atlas) { +#ifdef USE_SDL2 + // +++ should be enabled after + return nullptr; +#else #if SDL_BYTEORDER == SDL_BIG_ENDIAN const int rmask = 0xff000000; const int gmask = 0x00ff0000; @@ -223,7 +227,6 @@ SDL_Surface *AtlasManager::createSDLAtlas(TextureAtlas *const atlas) // temp SDL surface for atlas SDL_Surface *const surface = SDL_CreateRGBSurface(SDL_SWSURFACE, atlas->width, atlas->height, 32, rmask, gmask, bmask, amask); - if (!surface) return nullptr; @@ -251,6 +254,7 @@ SDL_Surface *AtlasManager::createSDLAtlas(TextureAtlas *const atlas) delete graphics; atlas->surface = surface; return surface; +#endif } void AtlasManager::convertAtlas(TextureAtlas *const atlas) |