Merge pull request #1708 from akortunov/refidfix

fix GCC warnings

apps/openmw/mwrender/globalmap.cpp

@@ -125,7 +125,7 @@ namespace MWRender
                     {
                         for (int cellX=0; cellX<mCellSize; ++cellX)
                         {
-                            int vertexX = static_cast<int>(float(cellX)/float(mCellSize) * 9);
+                            int vertexX = static_cast<int>(float(cellX) / float(mCellSize) * 9);
                             int vertexY = static_cast<int>(float(cellY) / float(mCellSize) * 9);
 
                             int texelX = (x-mMinX) * mCellSize + cellX;
@@ -135,9 +135,9 @@ namespace MWRender
 
                             float y2 = 0;
                             if (land && (land->mDataTypes & ESM::Land::DATA_WNAM))
-                                y2 = (land->mWnam[vertexY * 9 + vertexX] << 4) / 2048.f;
+                                y2 = land->mWnam[vertexY * 9 + vertexX] / 128.f;
                             else
-                                y2 = (SCHAR_MIN << 4) / 2048.f;
+                                y2 = SCHAR_MIN / 128.f;
                             if (y2 < 0)
                             {
                                 r = static_cast<unsigned char>(14 * y2 + 38);

apps/openmw/mwsound/openal_output.cpp

@@ -951,10 +951,11 @@ std::pair<Sound_Handle,size_t> OpenAL_Output::loadSound(const std::string &fname
     getALError();
 
     std::vector<char> data;
-    ALenum format;
-    int srate;
+    ALenum format = AL_NONE;
+    int srate = 0;
 
-    try {
+    try
+    {
         DecoderPtr decoder = mManager.getDecoder();
         // Workaround: Bethesda at some point converted some of the files to mp3, but the references were kept as .wav.
         if(decoder->mResourceMgr->exists(fname))
@@ -974,7 +975,8 @@ std::pair<Sound_Handle,size_t> OpenAL_Output::loadSound(const std::string &fname
         format = getALFormat(chans, type);
         if(format) decoder->readAll(data);
     }
-    catch(std::exception &e) {
+    catch(std::exception &e)
+    {
         std::cerr<< "Failed to load audio from "<<fname<<": "<<e.what() <<std::endl;
     }