diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 22:30:00 +0100 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2009-02-09 17:10:37 -0700 |
| commit | 1db7d10787f462430054ba04110a8d4647bdbd0a (patch) | |
| tree | 60dc4d04c738b1f54a41bc9d9b6d0e5ffb0fb1d4 /src/gui/inventorywindow.cpp | |
| parent | 1ae95b709235ce811ce72437aa257bb7500e00d0 (diff) | |
| download | mana-1db7d10787f462430054ba04110a8d4647bdbd0a.tar.gz mana-1db7d10787f462430054ba04110a8d4647bdbd0a.tar.bz2 mana-1db7d10787f462430054ba04110a8d4647bdbd0a.tar.xz mana-1db7d10787f462430054ba04110a8d4647bdbd0a.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.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index 70b3efb5..b9fe1c90 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -57,11 +57,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"); @@ -150,7 +150,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)); |