diff options
| author | Philipp Sehmisch <crush@themanaworld.org> | 2009-02-11 17:02:16 +0100 |
|---|---|---|
| committer | Philipp Sehmisch <crush@themanaworld.org> | 2009-02-11 17:02:16 +0100 |
| commit | f262dbd28f08001d70416e3cc4e62273d3fee2cd (patch) | |
| tree | 539cbc8b27edf696120df0ac26531640c323692f /src/player.cpp | |
| parent | d68f3fa13297cf4c8d29753e48c684496852ceba (diff) | |
| parent | 63ac001daa7dfc0735dfefd9c2829c8786b4edaf (diff) | |
| download | mana-f262dbd28f08001d70416e3cc4e62273d3fee2cd.tar.gz mana-f262dbd28f08001d70416e3cc4e62273d3fee2cd.tar.bz2 mana-f262dbd28f08001d70416e3cc4e62273d3fee2cd.tar.xz mana-f262dbd28f08001d70416e3cc4e62273d3fee2cd.zip | |
Merge branch 'master' of git@gitorious.org:tmw/eathena
Diffstat (limited to 'src/player.cpp')
| -rw-r--r-- | src/player.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/player.cpp b/src/player.cpp index 610dfeb1..a2a263b3 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -169,11 +169,12 @@ void Player::setSprite(int slot, int id, std::string color) std::string filename = ItemDB::get(id).getSprite(mGender); AnimatedSprite *equipmentSprite = NULL; - if (filename != "") + if (!filename.empty()) { - if (color!="") filename += "|" + color; + if (!color.empty()) + filename += "|" + color; equipmentSprite = AnimatedSprite::load( - "graphics/sprites/" + filename); + "graphics/sprites/" + filename); } if (equipmentSprite) |