diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-08-21 22:44:29 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-08-21 22:45:15 +0300 |
commit | 42f47e483da19079a937c4801ca94bd62d8dc970 (patch) | |
tree | 56dc96737e01e04d54357ce7118de3a1f000c516 /src/resources/iteminfo.cpp | |
parent | 2d8b9246c8003f1d32ba396bc19cc11bc5a595b2 (diff) | |
download | mv-42f47e483da19079a937c4801ca94bd62d8dc970.tar.gz mv-42f47e483da19079a937c4801ca94bd62d8dc970.tar.bz2 mv-42f47e483da19079a937c4801ca94bd62d8dc970.tar.xz mv-42f47e483da19079a937c4801ca94bd62d8dc970.zip |
Remove useless else.
Diffstat (limited to 'src/resources/iteminfo.cpp')
-rw-r--r-- | src/resources/iteminfo.cpp | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp index 2997a48ad..60810e000 100644 --- a/src/resources/iteminfo.cpp +++ b/src/resources/iteminfo.cpp @@ -104,20 +104,17 @@ const std::string &ItemInfo::getSprite(const GenderT gender, // Forward the request to the item defining how to view this item return ItemDB::get(mView).getSprite(gender, race); } - else - { - static const std::string empty; - std::map<int, std::string>::const_iterator i = - mAnimationFiles.find(CAST_S32(gender) + - toInt(race, int) * 4); - - if (i != mAnimationFiles.end()) - return i->second; - i = mAnimationFiles.find(CAST_S32(gender)); - if (i != mAnimationFiles.end()) - return i->second; - return empty; - } + static const std::string empty; + std::map<int, std::string>::const_iterator i = + mAnimationFiles.find(CAST_S32(gender) + + toInt(race, int) * 4); + + if (i != mAnimationFiles.end()) + return i->second; + i = mAnimationFiles.find(CAST_S32(gender)); + if (i != mAnimationFiles.end()) + return i->second; + return empty; } void ItemInfo::setAttackAction(const std::string &attackAction) |