From 7e0a97d2521b9ce57003176e82a0b5564aa003c2 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 17 Jul 2012 23:26:59 +0300
Subject: Fix more code style and additional warnings.

---
 src/resources/dye.cpp               | 5 +++--
 src/resources/monsterdb.cpp         | 3 ++-
 src/resources/openglimagehelper.cpp | 6 +++---
 src/resources/openglimagehelper.h   | 2 +-
 src/resources/sdlimagehelper.cpp    | 6 ++++--
 5 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'src/resources')

diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp
index 316dff9f3..df26ec1b7 100644
--- a/src/resources/dye.cpp
+++ b/src/resources/dye.cpp
@@ -54,8 +54,9 @@ DyePalette::DyePalette(const std::string &description, int8_t blockSize)
         for (int i = 0, colorIdx = 0; i < blockSize && colorIdx < dyePalateSize;
              i +=2, colorIdx ++)
         {
-            color.value[colorIdx] = (hexDecode(description[pos + i]) << 4)
-                + hexDecode(description[pos + i + 1]);
+            color.value[colorIdx] = static_cast<unsigned char>((
+                hexDecode(description[pos + i]) << 4)
+                + hexDecode(description[pos + i + 1]));
         }
         mColors.push_back(color);
         pos += blockSize;
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index d76585fd2..427db8f19 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -106,7 +106,8 @@ void MonsterDB::load()
         else if (walkStr == "walkswim" || walkStr == "swimwalk")
             block = Map::BLOCKMASK_AIR;
 
-        currentInfo->setWalkMask(Map::BLOCKMASK_WALL | block);
+        currentInfo->setWalkMask(static_cast<unsigned char>(
+            Map::BLOCKMASK_WALL | block));
 
         if (currentInfo->getMaxHP())
             currentInfo->setStaticMaxHP(true);
diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp
index aec68f32a..ae3b55741 100644
--- a/src/resources/openglimagehelper.cpp
+++ b/src/resources/openglimagehelper.cpp
@@ -125,7 +125,7 @@ Resource *OpenGLImageHelper::load(SDL_RWops *rw, Dye const &dye)
 
 Image *OpenGLImageHelper::load(SDL_Surface *tmpImage)
 {
-    return _GLload(tmpImage);
+    return glLoad(tmpImage);
 }
 
 Image *OpenGLImageHelper::createTextSurface(SDL_Surface *tmpImage, float alpha)
@@ -133,7 +133,7 @@ Image *OpenGLImageHelper::createTextSurface(SDL_Surface *tmpImage, float alpha)
     if (!tmpImage)
         return nullptr;
 
-    Image *img = _GLload(tmpImage);
+    Image *img = glLoad(tmpImage);
     if (img)
         img->setAlpha(alpha);
     return img;
@@ -155,7 +155,7 @@ int OpenGLImageHelper::powerOfTwo(int input)
     return value >= mTextureSize ? mTextureSize : value;
 }
 
-Image *OpenGLImageHelper::_GLload(SDL_Surface *tmpImage)
+Image *OpenGLImageHelper::glLoad(SDL_Surface *tmpImage)
 {
     if (!tmpImage)
         return nullptr;
diff --git a/src/resources/openglimagehelper.h b/src/resources/openglimagehelper.h
index b27409040..edba4cdef 100644
--- a/src/resources/openglimagehelper.h
+++ b/src/resources/openglimagehelper.h
@@ -112,7 +112,7 @@ class OpenGLImageHelper : public ImageHelper
          */
         int powerOfTwo(int input);
 
-        Image *_GLload(SDL_Surface *tmpImage);
+        Image *glLoad(SDL_Surface *tmpImage);
 
         static int mUseOpenGL;
         static int mTextureSize;
diff --git a/src/resources/sdlimagehelper.cpp b/src/resources/sdlimagehelper.cpp
index 78094b211..5463abfeb 100644
--- a/src/resources/sdlimagehelper.cpp
+++ b/src/resources/sdlimagehelper.cpp
@@ -154,7 +154,8 @@ Image *SDLImageHelper::createTextSurface(SDL_Surface *tmpImage, float alpha)
             uint32_t c = (static_cast<uint32_t*>(tmpImage->pixels))[i];
 
             unsigned v = (c & fmt->Amask) >> fmt->Ashift;
-            uint8_t a = (v << fmt->Aloss) + (v >> (8 - (fmt->Aloss << 1)));
+            uint8_t a = static_cast<uint8_t>((v << fmt->Aloss)
+                + (v >> (8 - (fmt->Aloss << 1))));
 
             uint8_t a2 = static_cast<uint8_t>(static_cast<float>(a) * alpha);
 
@@ -241,7 +242,8 @@ Image *SDLImageHelper::_SDLload(SDL_Surface *tmpImage)
             {
                 unsigned v = ((static_cast<uint32_t*>(tmpImage->pixels))[i]
                     & fmt->Amask) >> fmt->Ashift;
-                uint8_t a = (v << fmt->Aloss) + (v >> (8 - (fmt->Aloss << 1)));
+                uint8_t a = static_cast<uint8_t>((v << fmt->Aloss)
+                    + (v >> (8 - (fmt->Aloss << 1))));
 
                 if (a != 255)
                     hasAlpha = true;
-- 
cgit v1.2.3-70-g09d2