summaryrefslogtreecommitdiff
path: root/src/guild.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-09-09 23:11:23 +0300
committerAndrei Karas <akaras@inbox.ru>2011-09-09 23:11:23 +0300
commite3dabb7f0a22c6442dde5f261d3414f9e7369592 (patch)
tree494dbbaeb834f8278f840a996fe9d3dd53f96e1f /src/guild.cpp
parent703a3c4df3732e3e88559147001260f3355d42d6 (diff)
downloadmv-e3dabb7f0a22c6442dde5f261d3414f9e7369592.tar.gz
mv-e3dabb7f0a22c6442dde5f261d3414f9e7369592.tar.bz2
mv-e3dabb7f0a22c6442dde5f261d3414f9e7369592.tar.xz
mv-e3dabb7f0a22c6442dde5f261d3414f9e7369592.zip
Last fix part of shadow variables/methods errors.
Diffstat (limited to 'src/guild.cpp')
-rw-r--r--src/guild.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/guild.cpp b/src/guild.cpp
index 234c7d32f..a2d9149eb 100644
--- a/src/guild.cpp
+++ b/src/guild.cpp
@@ -170,9 +170,9 @@ void Guild::removeMember(GuildMember *member)
(*itr)->mCharId == member->mCharId &&
(*itr)->getName() == member->getName())
{
- GuildMember *member = *itr;
+ GuildMember *m = *itr;
mMembers.erase(itr);
- delete member;
+ delete m;
return;
}
++itr;