From 4484b433abc8f07bcf7d4d22fd946e00b66b078d Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 9 Sep 2011 19:43:40 +0300
Subject: Fix first part of shadow variables/methods errors.

---
 src/resources/ambientlayer.cpp | 8 ++++----
 src/resources/colordb.h        | 8 ++++----
 src/resources/itemdb.h         | 8 ++++----
 src/resources/spritedef.h      | 6 +++---
 4 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/resources')

diff --git a/src/resources/ambientlayer.cpp b/src/resources/ambientlayer.cpp
index 10d70c2c7..319bc5b8c 100644
--- a/src/resources/ambientlayer.cpp
+++ b/src/resources/ambientlayer.cpp
@@ -41,16 +41,16 @@ AmbientLayer::AmbientLayer(Image *img, float parallax,
     if (keepRatio && !mImage->useOpenGL()
         /*&& defaultScreenWidth != 0
         && defaultScreenHeight != 0*/
-        && graphics->mWidth != defaultScreenWidth
-        && graphics->mHeight != defaultScreenHeight)
+        && mainGraphics->mWidth != defaultScreenWidth
+        && mainGraphics->mHeight != defaultScreenHeight)
     {
         // Rescale the overlay to keep the ratio as if we were on
         // the default resolution...
         Image *rescaledOverlay = ResourceManager::getInstance()->
             getRescaled(mImage, static_cast<int>(mImage->mBounds.w)
-            / defaultScreenWidth * graphics->mWidth,
+            / defaultScreenWidth * mainGraphics->mWidth,
             static_cast<int>(mImage->mBounds.h)
-            / defaultScreenHeight * graphics->mHeight);
+            / defaultScreenHeight * mainGraphics->mHeight);
 
         if (rescaledOverlay)
             mImage = rescaledOverlay;
diff --git a/src/resources/colordb.h b/src/resources/colordb.h
index ce128578e..83bff57da 100644
--- a/src/resources/colordb.h
+++ b/src/resources/colordb.h
@@ -38,11 +38,11 @@ namespace ColorDB
                 color("")
             { }
 
-            ItemColor(int id, std::string name, std::string color)
+            ItemColor(int id0, std::string name0, std::string color0)
             {
-                this->id = id;
-                this->name = name;
-                this->color = color;
+                this->id = id0;
+                this->name = name0;
+                this->color = color0;
             }
 
             int id;
diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index 267f60eef..c20961eff 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.h
@@ -68,10 +68,10 @@ namespace ItemDB
 
     struct Stat
     {
-        Stat(const std::string &tag,
-             const std::string &format):
-            tag(tag),
-            format(format)
+        Stat(const std::string &tag0,
+             const std::string &format0) :
+            tag(tag0),
+            format(format0)
         {}
 
         std::string tag;
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 8fa64e7b9..ccad62b1b 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -43,10 +43,10 @@ struct SpriteReference
         sprite(""), variant(0)
     {}
 
-    SpriteReference(std::string sprite, int variant)
+    SpriteReference(std::string sprite0, int variant0)
     {
-        this->sprite = sprite;
-        this->variant = variant;
+        sprite = sprite0;
+        variant = variant0;
     }
 
     std::string sprite;
-- 
cgit v1.2.3-60-g2f50