diff options
| author | Blue <bluesansdouze@gmail.com> | 2009-05-12 20:46:56 +0200 |
|---|---|---|
| committer | Blue <bluesansdouze@gmail.com> | 2009-05-12 20:46:56 +0200 |
| commit | 9071a692116745f2cafd8556cbff28095910730e (patch) | |
| tree | 6fbc96a1cb00558c4015d1eff25f45b2c6ccdcb8 /src/gui/widgets/avatar.cpp | |
| parent | 2e94f4e92821bad6ebb328d00b2bd918c4b1b99e (diff) | |
| parent | 0257eaf4d3945eac7cb3e50ccf8dfef18fa29698 (diff) | |
| download | mana-client-9071a692116745f2cafd8556cbff28095910730e.tar.gz mana-client-9071a692116745f2cafd8556cbff28095910730e.tar.bz2 mana-client-9071a692116745f2cafd8556cbff28095910730e.tar.xz mana-client-9071a692116745f2cafd8556cbff28095910730e.zip | |
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/gui/widgets/avatar.cpp')
| -rw-r--r-- | src/gui/widgets/avatar.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/gui/widgets/avatar.cpp b/src/gui/widgets/avatar.cpp index 116640d8..b120c51f 100644 --- a/src/gui/widgets/avatar.cpp +++ b/src/gui/widgets/avatar.cpp @@ -104,13 +104,7 @@ void Avatar::updateAvatarLabel() std::ostringstream ss; ss << mName; - if (mName == player_node->getName()) - { - mHp = player_node->getHp(); - mMaxHp = player_node->getMaxHp(); - } - - if (mMaxHp != 0) + if (mName != player_node->getName() && mMaxHp != 0) ss << " (" << mHp << "/" << mMaxHp << ")"; mLabel->setCaption(ss.str()); |