summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gui/inventorywindow.cpp28
-rw-r--r--src/gui/inventorywindow.h2
2 files changed, 8 insertions, 22 deletions
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 302d2cab..621a85d3 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -67,14 +67,12 @@ InventoryWindow::InventoryWindow():
mItemDescriptionLabel = new TextBox();
mItemEffect = "Effect:";
mItemEffectLabel = new TextBox();
- mWeight = "Total Weight: " + mTotalWeight + " g - " +
- "Maximum Weight: " + mMaxWeight + " g";
+ mWeight = "Weight: " + mTotalWeight + " g / " +
+ mMaxWeight + " g Slots: " +
+ toString(player_node->getInventory()->getNumberOfSlotsUsed()) +
+ "/" + toString(player_node->getInventory()->getInventorySize());
mWeightLabel = new TextBox();
mWeightLabel->setPosition(8, 8);
- mSlots = "Slots: " +
- toString(player_node->getInventory()->getNumberOfSlotsUsed()) +
- "/" + toString(player_node->getInventory()->getInventorySize());
- mSlotsLabel = new TextBox();
mItemEffectLabel = new TextBox();
draw();
@@ -86,7 +84,6 @@ InventoryWindow::InventoryWindow():
add(mItemDescriptionLabel);
add(mItemEffectLabel);
add(mWeightLabel);
- add(mSlotsLabel);
mUseButton->setSize(60, mUseButton->getHeight());
@@ -108,10 +105,8 @@ void InventoryWindow::logic()
mMaxWeight = toString(player_node->mMaxWeight);
// Adjust widgets
- mWeight = "Total Weight: " + mTotalWeight + " g - " +
- "Maximum Weight: " + mMaxWeight + " g";
-
- mSlots = "Slots: " +
+ mWeight = "Weight: " + mTotalWeight + " g / " +
+ mMaxWeight + " g Slots: " +
toString(player_node->getInventory()->getNumberOfSlotsUsed()) +
"/" + toString(player_node->getInventory()->getInventorySize());
@@ -230,19 +225,12 @@ void InventoryWindow::draw()
mItemEffectLabel->getY() - 5 - (mItemDescriptionLabel->getNumberOfRows()*15),
width - 16,
(mItemDescriptionLabel->getNumberOfRows()*15)));
- mSlotsLabel->setMinWidth(width - 16);
- mSlotsLabel->setTextWrapped(mSlots);
- mSlotsLabel->setDimension(gcn::Rectangle(8,
- mItemDescriptionLabel->getY() - 5 - (mSlotsLabel->getNumberOfRows()*15),
- width - 16,
- (mSlotsLabel->getNumberOfRows()*15)));
mInvenScroll->setSize(width - 16,
- mSlotsLabel->getY() - (mWeightLabel->getNumberOfRows()*15) - 18);
+ mItemDescriptionLabel->getY() - (mWeightLabel->getNumberOfRows()*15) - 18);
mInvenScroll->setPosition(8, (mWeightLabel->getNumberOfRows()*15) + 10);
- setMinHeight(130 + (mSlotsLabel->getNumberOfRows()*15) +
- (mWeightLabel->getNumberOfRows()*15) +
+ setMinHeight(130 + (mWeightLabel->getNumberOfRows()*15) +
(mItemDescriptionLabel->getNumberOfRows()*15) +
(mItemEffectLabel->getNumberOfRows()*15) +
(mItemNameLabel->getNumberOfRows()*15));
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 2e589471..c308ac25 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -90,14 +90,12 @@ class InventoryWindow : public Window, gcn::ActionListener,
std::string mWeight;
std::string mTotalWeight;
std::string mMaxWeight;
- std::string mSlots;
gcn::Button *mUseButton, *mDropButton;
gcn::ScrollArea *mInvenScroll;
TextBox *mItemNameLabel;
TextBox *mItemDescriptionLabel;
TextBox *mItemEffectLabel;
TextBox *mWeightLabel;
- TextBox *mSlotsLabel;
};
extern InventoryWindow *inventoryWindow;