From fd29de84b343f05ccca13e34cc11bc0b5496de55 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 4 Aug 2016 02:35:12 +0300 Subject: Fix shadowing method by variable name in some compilers. --- src/being/being.cpp | 10 +++++----- 1 file 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(); -- cgit v1.2.3-60-g2f50