summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-08-04 02:35:12 +0300
committerAndrei Karas <akaras@inbox.ru>2016-08-04 02:35:12 +0300
commitfd29de84b343f05ccca13e34cc11bc0b5496de55 (patch)
tree295d80db4585a2f6ea38a607ac6b5715f64ffac6 /src/being
parent4395144ddf6e8e8fc0965f77f2eca27b22dc43ca (diff)
downloadmv-fd29de84b343f05ccca13e34cc11bc0b5496de55.tar.gz
mv-fd29de84b343f05ccca13e34cc11bc0b5496de55.tar.bz2
mv-fd29de84b343f05ccca13e34cc11bc0b5496de55.tar.xz
mv-fd29de84b343f05ccca13e34cc11bc0b5496de55.zip
Fix shadowing method by variable name in some compilers.
Diffstat (limited to 'src/being')
-rw-r--r--src/being/being.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index a663a4d98..b4fe2c883 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -271,7 +271,7 @@ Being::Being(const BeingId id,
setMap(map);
setSubtype(subtype, 0);
- bool showName = false;
+ bool showName1 = false;
switch (mType)
{
@@ -280,11 +280,11 @@ Being::Being(const BeingId id,
case ActorType::Pet:
case ActorType::Homunculus:
case ActorType::Elemental:
- showName = config.getBoolValue("visiblenames");
+ showName1 = config.getBoolValue("visiblenames");
break;
case ActorType::Portal:
case ActorType::SkillUnit:
- showName = false;
+ showName1 = false;
break;
default:
case ActorType::Unknown:
@@ -307,8 +307,8 @@ Being::Being(const BeingId id,
if (mType == ActorType::Npc)
setShowName(true);
- else if (showName)
- setShowName(showName);
+ else if (showName1)
+ setShowName(showName1);
updateColors();
updatePercentHP();