summaryrefslogtreecommitdiff
path: root/src/gui/inventorywindow.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-02-09 22:30:00 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-02-09 22:31:11 +0100
commit07f7d52f661a74e6d0c780ca53e724651e3dcc48 (patch)
treeb55b8c0d04a1544ace42f00642adfde4ad045d94 /src/gui/inventorywindow.cpp
parent6c29cfa167820635ea602b5cc31dcfeb7b04478c (diff)
downloadMana-07f7d52f661a74e6d0c780ca53e724651e3dcc48.tar.gz
Mana-07f7d52f661a74e6d0c780ca53e724651e3dcc48.tar.bz2
Mana-07f7d52f661a74e6d0c780ca53e724651e3dcc48.tar.xz
Mana-07f7d52f661a74e6d0c780ca53e724651e3dcc48.zip
Mostly whitespace fixes
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
Diffstat (limited to 'src/gui/inventorywindow.cpp')
-rw-r--r--src/gui/inventorywindow.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 58c13910..3b868610 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -59,11 +59,11 @@ InventoryWindow::InventoryWindow(int invSize):
// If you adjust these defaults, don't forget to adjust the trade window's.
setDefaultSize(115, 25, 375, 300);
- std::string longestUseString = getFont()->getWidth(_("Equip")) >
+ std::string longestUseString = getFont()->getWidth(_("Equip")) >
getFont()->getWidth(_("Use")) ?
_("Equip") : _("Use");
- if (getFont()->getWidth(longestUseString) <
+ if (getFont()->getWidth(longestUseString) <
getFont()->getWidth(_("Unequip")))
{
longestUseString = _("Unequip");
@@ -140,7 +140,7 @@ void InventoryWindow::logic()
// Adjust progress bars
mSlotsBar->setProgress((float)
player_node->getInventory()->getNumberOfSlotsUsed() / mMaxSlots);
- mWeightBar->setProgress((float) player_node->mTotalWeight /
+ mWeightBar->setProgress((float) player_node->mTotalWeight /
player_node->mMaxWeight);
mSlotsBar->setText(strprintf("%s/%d", mUsedSlots.c_str(), mMaxSlots));