From a5da3a269eba5770a75fe14382c512492d3037ed Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 29 Aug 2016 12:20:00 +0200
Subject: [PATCH] Fix shadowing warnings

---
 components/compiler/scanner.cpp        | 12 ++++++------
 components/esm/inventorystate.cpp      |  6 +++---
 components/interpreter/interpreter.cpp |  4 ++--
 components/interpreter/miscopcodes.hpp |  2 +-
 components/nifosg/nifloader.cpp        |  8 ++++----
 components/shader/shadervisitor.cpp    | 18 +++++++++---------
 6 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/components/compiler/scanner.cpp b/components/compiler/scanner.cpp
index b370f74a1..720fde9f1 100644
--- a/components/compiler/scanner.cpp
+++ b/components/compiler/scanner.cpp
@@ -260,7 +260,7 @@ namespace Compiler
         return true;
     }
 
-    static const char *keywords[] =
+    static const char *sKeywords[] =
     {
         "begin", "end",
         "short", "long", "float",
@@ -306,11 +306,11 @@ namespace Compiler
 
         std::string lowerCase = Misc::StringUtils::lowerCase(name);
 
-        for (; keywords[i]; ++i)
-            if (lowerCase==keywords[i])
+        for (; sKeywords[i]; ++i)
+            if (lowerCase==sKeywords[i])
                 break;
 
-        if (keywords[i])
+        if (sKeywords[i])
         {
             cont = parser.parseKeyword (i, loc, *this);
             return true;
@@ -618,8 +618,8 @@ namespace Compiler
 
     void Scanner::listKeywords (std::vector<std::string>& keywords)
     {
-        for (int i=0; Compiler::keywords[i]; ++i)
-            keywords.push_back (Compiler::keywords[i]);
+        for (int i=0; Compiler::sKeywords[i]; ++i)
+            keywords.push_back (Compiler::sKeywords[i]);
 
         if (mExtensions)
             mExtensions->listKeywords (keywords);
diff --git a/components/esm/inventorystate.cpp b/components/esm/inventorystate.cpp
index b24128ec3..73db72b00 100644
--- a/components/esm/inventorystate.cpp
+++ b/components/esm/inventorystate.cpp
@@ -65,11 +65,11 @@ void ESM::InventoryState::load (ESMReader &esm)
     while (esm.isNextSub("EQUI"))
     {
         esm.getSubHeader();
-        int index;
-        esm.getT(index);
+        int equipIndex;
+        esm.getT(equipIndex);
         int slot;
         esm.getT(slot);
-        mEquipmentSlots[index] = slot;
+        mEquipmentSlots[equipIndex] = slot;
     }
 
     mSelectedEnchantItem = -1;
diff --git a/components/interpreter/interpreter.cpp b/components/interpreter/interpreter.cpp
index 1892e4a6f..e77a0bb72 100644
--- a/components/interpreter/interpreter.cpp
+++ b/components/interpreter/interpreter.cpp
@@ -241,9 +241,9 @@ namespace Interpreter
 
             while (mRuntime.getPC()>=0 && mRuntime.getPC()<opcodes)
             {
-                Type_Code code = codeBlock[mRuntime.getPC()];
+                Type_Code runCode = codeBlock[mRuntime.getPC()];
                 mRuntime.setPC (mRuntime.getPC()+1);
-                execute (code);
+                execute (runCode);
             }
         }
         catch (...)
diff --git a/components/interpreter/miscopcodes.hpp b/components/interpreter/miscopcodes.hpp
index 9d62b60aa..20a1b52be 100644
--- a/components/interpreter/miscopcodes.hpp
+++ b/components/interpreter/miscopcodes.hpp
@@ -116,7 +116,7 @@ namespace Interpreter
 
                 for (std::size_t i=0; i<arg0; ++i)
                 {
-                    int index = runtime[0].mInteger;
+                    index = runtime[0].mInteger;
                     runtime.pop();
                     buttons.push_back (runtime.getStringLiteral (index));
                 }
diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp
index 8a50c2c92..c08cd8391 100644
--- a/components/nifosg/nifloader.cpp
+++ b/components/nifosg/nifloader.cpp
@@ -698,14 +698,14 @@ namespace NifOsg
                     continue;
                 if (ctrl->recType == Nif::RC_NiUVController)
                 {
-                    const Nif::NiUVController *uvctrl = static_cast<const Nif::NiUVController*>(ctrl.getPtr());
+                    const Nif::NiUVController *niuvctrl = static_cast<const Nif::NiUVController*>(ctrl.getPtr());
                     std::set<int> texUnits;
                     for (unsigned int i=0; i<boundTextures.size(); ++i)
                         texUnits.insert(i);
 
-                    osg::ref_ptr<UVController> ctrl = new UVController(uvctrl->data.getPtr(), texUnits);
-                    setupController(uvctrl, ctrl, animflags);
-                    composite->addController(ctrl);
+                    osg::ref_ptr<UVController> uvctrl = new UVController(niuvctrl->data.getPtr(), texUnits);
+                    setupController(niuvctrl, uvctrl, animflags);
+                    composite->addController(uvctrl);
                 }
                 else if (ctrl->recType == Nif::RC_NiVisController)
                 {
diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp
index dbba721c2..041b568df 100644
--- a/components/shader/shadervisitor.cpp
+++ b/components/shader/shadervisitor.cpp
@@ -154,11 +154,11 @@ namespace Shader
 
             if (mAutoUseNormalMaps && diffuseMap != NULL && normalMap == NULL)
             {
-                std::string normalMap = diffuseMap->getImage(0)->getFileName();
+                std::string normalMapFileName = diffuseMap->getImage(0)->getFileName();
 
                 osg::ref_ptr<osg::Image> image;
                 bool normalHeight = false;
-                std::string normalHeightMap = normalMap;
+                std::string normalHeightMap = normalMapFileName;
                 boost::replace_last(normalHeightMap, ".", mNormalHeightMapPattern + ".");
                 if (mImageManager.getVFS()->exists(normalHeightMap))
                 {
@@ -167,10 +167,10 @@ namespace Shader
                 }
                 else
                 {
-                    boost::replace_last(normalMap, ".", mNormalMapPattern + ".");
-                    if (mImageManager.getVFS()->exists(normalMap))
+                    boost::replace_last(normalMapFileName, ".", mNormalMapPattern + ".");
+                    if (mImageManager.getVFS()->exists(normalMapFileName))
                     {
-                        image = mImageManager.getImage(normalMap);
+                        image = mImageManager.getImage(normalMapFileName);
                     }
                 }
 
@@ -196,11 +196,11 @@ namespace Shader
             }
             if (mAutoUseSpecularMaps && diffuseMap != NULL && specularMap == NULL)
             {
-                std::string specularMap = diffuseMap->getImage(0)->getFileName();
-                boost::replace_last(specularMap, ".", mSpecularMapPattern + ".");
-                if (mImageManager.getVFS()->exists(specularMap))
+                std::string specularMapFileName = diffuseMap->getImage(0)->getFileName();
+                boost::replace_last(specularMapFileName, ".", mSpecularMapPattern + ".");
+                if (mImageManager.getVFS()->exists(specularMapFileName))
                 {
-                    osg::ref_ptr<osg::Texture2D> specularMapTex (new osg::Texture2D(mImageManager.getImage(specularMap)));
+                    osg::ref_ptr<osg::Texture2D> specularMapTex (new osg::Texture2D(mImageManager.getImage(specularMapFileName)));
                     specularMapTex->setWrap(osg::Texture::WRAP_S, diffuseMap->getWrap(osg::Texture::WRAP_S));
                     specularMapTex->setWrap(osg::Texture::WRAP_T, diffuseMap->getWrap(osg::Texture::WRAP_T));
                     specularMapTex->setFilter(osg::Texture::MIN_FILTER, diffuseMap->getFilter(osg::Texture::MIN_FILTER));