diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-09-09 23:11:23 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-09-09 23:11:23 +0300 |
| commit | e3dabb7f0a22c6442dde5f261d3414f9e7369592 (patch) | |
| tree | 494dbbaeb834f8278f840a996fe9d3dd53f96e1f /src/resources/beinginfo.cpp | |
| parent | 703a3c4df3732e3e88559147001260f3355d42d6 (diff) | |
| download | manaplus-e3dabb7f0a22c6442dde5f261d3414f9e7369592.tar.gz manaplus-e3dabb7f0a22c6442dde5f261d3414f9e7369592.tar.bz2 manaplus-e3dabb7f0a22c6442dde5f261d3414f9e7369592.tar.xz manaplus-e3dabb7f0a22c6442dde5f261d3414f9e7369592.zip | |
Last fix part of shadow variables/methods errors.
Diffstat (limited to 'src/resources/beinginfo.cpp')
| -rw-r--r-- | src/resources/beinginfo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp index 8beea420d..4aa7515b1 100644 --- a/src/resources/beinginfo.cpp +++ b/src/resources/beinginfo.cpp @@ -94,10 +94,10 @@ void BeingInfo::addSound(SoundEvent event, const std::string &filename) const std::string &BeingInfo::getSound(SoundEvent event) const { - static std::string empty(""); + static std::string emptySound(""); SoundEvents::const_iterator i = mSounds.find(event); - return (i == mSounds.end() || !i->second) ? empty : + return (i == mSounds.end() || !i->second) ? emptySound : i->second->at(rand() % i->second->size()); } |