summaryrefslogtreecommitdiff
path: root/src/gui/inventorywindow.cpp
diff options
context:
space:
mode:
authorBlue <bluesansdouze@gmail.com>2009-05-12 20:46:56 +0200
committerBlue <bluesansdouze@gmail.com>2009-05-12 20:46:56 +0200
commit9071a692116745f2cafd8556cbff28095910730e (patch)
tree6fbc96a1cb00558c4015d1eff25f45b2c6ccdcb8 /src/gui/inventorywindow.cpp
parent2e94f4e92821bad6ebb328d00b2bd918c4b1b99e (diff)
parent0257eaf4d3945eac7cb3e50ccf8dfef18fa29698 (diff)
downloadmana-client-9071a692116745f2cafd8556cbff28095910730e.tar.gz
mana-client-9071a692116745f2cafd8556cbff28095910730e.tar.bz2
mana-client-9071a692116745f2cafd8556cbff28095910730e.tar.xz
mana-client-9071a692116745f2cafd8556cbff28095910730e.zip
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/gui/inventorywindow.cpp')
-rw-r--r--src/gui/inventorywindow.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index efa5bc2e..d6cd3a84 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -92,8 +92,8 @@ InventoryWindow::InventoryWindow(int invSize):
mSlotsLabel = new Label(_("Slots:"));
mWeightLabel = new Label(_("Weight:"));
- mSlotsBar = new ProgressBar(1.0f, 100, 20, gcn::Color(225, 200, 25));
- mWeightBar = new ProgressBar(1.0f, 100, 20, gcn::Color(0, 0, 255));
+ mSlotsBar = new ProgressBar(0.0f, 100, 20, gcn::Color(225, 200, 25));
+ mWeightBar = new ProgressBar(0.0f, 100, 20, gcn::Color(0, 0, 255));
place(0, 0, mWeightLabel).setPadding(3);
place(1, 0, mWeightBar, 3);
@@ -166,12 +166,12 @@ void InventoryWindow::action(const gcn::ActionEvent &event)
if (item->isEquipment())
{
if (item->isEquipped())
- player_node->unequipItem(item);
+ Net::getInventoryHandler()->unequipItem(item);
else
- player_node->equipItem(item);
+ Net::getInventoryHandler()->equipItem(item);
}
else
- player_node->useItem(item);
+ Net::getInventoryHandler()->useItem(item);
}
else if (event.getId() == "drop")
{