summaryrefslogtreecommitdiff
path: root/src/gui/palette.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-09-09 19:43:40 +0300
committerAndrei Karas <akaras@inbox.ru>2011-09-09 19:43:40 +0300
commit4484b433abc8f07bcf7d4d22fd946e00b66b078d (patch)
treed8d04c6ea9526b90334e7b0a4abf44e2508a3597 /src/gui/palette.h
parentc1fb0bf9dc98e2a30f33cbbf4f74604b36efbcba (diff)
downloadManaVerse-4484b433abc8f07bcf7d4d22fd946e00b66b078d.tar.gz
ManaVerse-4484b433abc8f07bcf7d4d22fd946e00b66b078d.tar.bz2
ManaVerse-4484b433abc8f07bcf7d4d22fd946e00b66b078d.tar.xz
ManaVerse-4484b433abc8f07bcf7d4d22fd946e00b66b078d.zip
Fix first part of shadow variables/methods errors.
Diffstat (limited to 'src/gui/palette.h')
-rw-r--r--src/gui/palette.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/gui/palette.h b/src/gui/palette.h
index 1cebe236f..645260280 100644
--- a/src/gui/palette.h
+++ b/src/gui/palette.h
@@ -182,13 +182,14 @@ class Palette
int delay;
int committedDelay;
- void set(int type, gcn::Color& color, GradientType grad, int delay)
+ void set(int type0, gcn::Color& color0, GradientType grad0,
+ int delay0)
{
- ColorElem::type = type;
- ColorElem::color = color;
- ColorElem::testColor = color;
- ColorElem::grad = grad;
- ColorElem::delay = delay;
+ ColorElem::type = type0;
+ ColorElem::color = color0;
+ ColorElem::testColor = color0;
+ ColorElem::grad = grad0;
+ ColorElem::delay = delay0;
ColorElem::gradientIndex = rand();
}