diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-03-27 21:41:20 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-03-27 21:41:20 +0300 |
| commit | 964ffbb9b6ed5246b14a7d0c0d065f7d38af0912 (patch) | |
| tree | edef1b3f31183402e2d0f86ee48c9734c2a03c7e /src/gui/itempopup.cpp | |
| parent | 41ac086fcd38fd472b579a495a8e8e7685ae4722 (diff) | |
| download | mv-964ffbb9b6ed5246b14a7d0c0d065f7d38af0912.tar.gz mv-964ffbb9b6ed5246b14a7d0c0d065f7d38af0912.tar.bz2 mv-964ffbb9b6ed5246b14a7d0c0d065f7d38af0912.tar.xz mv-964ffbb9b6ed5246b14a7d0c0d065f7d38af0912.zip | |
Fix some warnings and improve code from gcc 4.6 compilation.
Diffstat (limited to 'src/gui/itempopup.cpp')
| -rw-r--r-- | src/gui/itempopup.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp index 493b5041a..e09d0ce0a 100644 --- a/src/gui/itempopup.cpp +++ b/src/gui/itempopup.cpp @@ -116,8 +116,8 @@ void ItemPopup::setItem(const Item *item, bool showImage) ii.getName().c_str(), item->getRefine(), ii.getId())); } mItemName->adjustSize(); - int minWidth = mItemName->getWidth() + 8; - if (getWidth() < minWidth) + unsigned minWidth = mItemName->getWidth() + 8; + if ((unsigned)getWidth() < minWidth) setWidth(minWidth); } } @@ -256,6 +256,10 @@ gcn::Color ItemPopup::getColor(ItemType type) return Theme::getThemeColor(Theme::FEET); case ITEM_EQUIPMENT_AMMO: return Theme::getThemeColor(Theme::AMMO); + case ITEM_EQUIPMENT_CHARM: + return Theme::getThemeColor(Theme::CHARM); + case ITEM_SPRITE_RACE: + case ITEM_SPRITE_HAIR: default: return Theme::getThemeColor(Theme::UNKNOWN_ITEM); } |