diff options
| author | Fate <fate-tmw@googlemail.com> | 2008-11-23 11:52:51 -0700 |
|---|---|---|
| committer | Fate <fate-tmw@googlemail.com> | 2008-11-23 11:52:51 -0700 |
| commit | ba0d53c6234562b1826dfeb58d02e49757c2ce5b (patch) | |
| tree | 2134447b73b89215c824dde6e6d520bbe35c8083 /src/gui/itemshortcutcontainer.cpp | |
| parent | d011f8f984f454a76adaf04142df0daa03dd00a8 (diff) | |
| parent | 31f40703d569478619952343bde3f73c3a576847 (diff) | |
| download | mana-client-ba0d53c6234562b1826dfeb58d02e49757c2ce5b.tar.gz mana-client-ba0d53c6234562b1826dfeb58d02e49757c2ce5b.tar.bz2 mana-client-ba0d53c6234562b1826dfeb58d02e49757c2ce5b.tar.xz mana-client-ba0d53c6234562b1826dfeb58d02e49757c2ce5b.zip | |
Merge branch '0.0' of git@gitorious.org:tmw/mainline into 0.0
Diffstat (limited to 'src/gui/itemshortcutcontainer.cpp')
| -rw-r--r-- | src/gui/itemshortcutcontainer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/itemshortcutcontainer.cpp b/src/gui/itemshortcutcontainer.cpp index 0ce4f6b7..2ea5d584 100644 --- a/src/gui/itemshortcutcontainer.cpp +++ b/src/gui/itemshortcutcontainer.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #include "itemshortcutcontainer.h" @@ -88,7 +86,7 @@ ItemShortcutContainer::draw(gcn::Graphics *graphics) // Draw item keyboard shortcut. const char *key = SDL_GetKeyName( - (SDLKey) keyboard.getKeyValue(keyboard.KEY_SHORTCUT_0+i)); + (SDLKey) keyboard.getKeyValue(keyboard.KEY_SHORTCUT_0 + i)); g->drawText(key, itemX + 2, itemY + 2, gcn::Graphics::LEFT); if (itemShortcut->getItem(i) < 0) @@ -100,9 +98,11 @@ ItemShortcutContainer::draw(gcn::Graphics *graphics) // Draw item icon. Image* image = item->getImage(); if (image) { + const std::string label = + item->isEquipped() ? "Eq." : toString(item->getQuantity()); g->drawImage(image, itemX, itemY); g->drawText( - toString(item->getQuantity()), + label, itemX + mBoxWidth / 2, itemY + mBoxHeight - 14, gcn::Graphics::CENTER); |