From bb0281c87995e11dc1cac95009a5253356d94d1a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 21 Aug 2013 23:58:06 +0300 Subject: some SDL2 complilation fixes. --- src/resources/atlasmanager.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/resources') 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) -- cgit v1.2.3-70-g09d2