diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-04-30 19:52:34 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-04-30 19:52:34 +0300 |
commit | dc569bbcb4c12a5a400f9e5701e5c1027badadae (patch) | |
tree | 9b502cafda345e7fb4b0342de97c77822544d9fd /src/resources/atlasmanager.cpp | |
parent | 88c6a0aa757df0ec38bc67f2cf314f8be3efd0ce (diff) | |
download | manaplus-dc569bbcb4c12a5a400f9e5701e5c1027badadae.tar.gz manaplus-dc569bbcb4c12a5a400f9e5701e5c1027badadae.tar.bz2 manaplus-dc569bbcb4c12a5a400f9e5701e5c1027badadae.tar.xz manaplus-dc569bbcb4c12a5a400f9e5701e5c1027badadae.zip |
Fix code style in resources.
Diffstat (limited to 'src/resources/atlasmanager.cpp')
-rw-r--r-- | src/resources/atlasmanager.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/resources/atlasmanager.cpp b/src/resources/atlasmanager.cpp index 90aea108d..c3ba82fdd 100644 --- a/src/resources/atlasmanager.cpp +++ b/src/resources/atlasmanager.cpp @@ -202,15 +202,15 @@ void AtlasManager::simpleSort(const std::string &restrict name, SDL_Surface *AtlasManager::createSDLAtlas(TextureAtlas *const atlas) { #if SDL_BYTEORDER == SDL_BIG_ENDIAN - const int rmask = 0xff000000; - const int gmask = 0x00ff0000; - const int bmask = 0x0000ff00; - const int amask = 0x000000ff; + const unsigned int rmask = 0xff000000; + const unsigned int gmask = 0x00ff0000; + const unsigned int bmask = 0x0000ff00; + const unsigned int amask = 0x000000ff; #else - const int rmask = 0x000000ff; - const int gmask = 0x0000ff00; - const int bmask = 0x00ff0000; - const int amask = 0xff000000; + const unsigned int rmask = 0x000000ff; + const unsigned int gmask = 0x0000ff00; + const unsigned int bmask = 0x00ff0000; + const unsigned int amask = 0xff000000; #endif // do not create atlas based on only one image @@ -225,7 +225,7 @@ SDL_Surface *AtlasManager::createSDLAtlas(TextureAtlas *const atlas) const int height = atlas->height; // temp SDL surface for atlas SDL_Surface *const surface = MSDL_CreateRGBSurface(SDL_SWSURFACE, - width, height, 32, rmask, gmask, bmask, amask); + width, height, 32U, rmask, gmask, bmask, amask); if (!surface) return nullptr; |