diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:22:50 +0100 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:22:50 +0100 |
| commit | a1e61f8446b7928d854a062f6494e75fe3fec9ab (patch) | |
| tree | 953cba5593a49f818612f38de1149a2763a36aa8 /src/gui/widgets/itemcontainer.cpp | |
| parent | 79cb8fa1ca81440e21bcb186785d47c50a608e8e (diff) | |
| parent | 8954a7ca0f70bbf167c9119d26c7bca8407e8da6 (diff) | |
| download | Mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.gz Mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.bz2 Mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.xz Mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.zip | |
Merge github.com:mana/mana
Conflicts:
src/localplayer.cpp
src/net/manaserv/beinghandler.cpp
src/net/manaserv/charhandler.cpp
Diffstat (limited to 'src/gui/widgets/itemcontainer.cpp')
| -rw-r--r-- | src/gui/widgets/itemcontainer.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index 546a16d2..d88a5747 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -52,7 +52,7 @@ static const int BOX_WIDTH = 35; static const int BOX_HEIGHT = 43; -ItemContainer::ItemContainer(Inventory *inventory, bool forceQuantity): +ItemContainer::ItemContainer(Inventory *inventory): mInventory(inventory), mGridColumns(1), mGridRows(1), @@ -60,7 +60,6 @@ ItemContainer::ItemContainer(Inventory *inventory, bool forceQuantity): mHighlightedIndex(-1), mLastUsedSlot(-1), mSelectionStatus(SEL_NONE), - mForceQuantity(forceQuantity), mSwapItems(false), mDescItems(false) { @@ -159,7 +158,7 @@ void ItemContainer::draw(gcn::Graphics *graphics) } // Draw item caption std::string caption; - if (item->getQuantity() > 1 || mForceQuantity) + if (item->getQuantity() > 1) caption = toString(item->getQuantity()); else if (item->isEquipped()) caption = "Eq."; |