summaryrefslogtreecommitdiff
path: root/src/gui/equipmentwindow.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-04-06 22:46:15 +0200
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-04-06 22:46:15 +0200
commitf0fd20fdd649eb61fa0d2444d910a2b0882e3580 (patch)
treeee879af37c773e8a40b353e6e1e714ab5e1f45b1 /src/gui/equipmentwindow.cpp
parent7ee2220427d8735c777f504517c24c49afda699f (diff)
downloadmana-f0fd20fdd649eb61fa0d2444d910a2b0882e3580.tar.gz
mana-f0fd20fdd649eb61fa0d2444d910a2b0882e3580.tar.bz2
mana-f0fd20fdd649eb61fa0d2444d910a2b0882e3580.tar.xz
mana-f0fd20fdd649eb61fa0d2444d910a2b0882e3580.zip
Moved many MessageOut constructions around
No real point in having these abstracted away twice. We're using network interfaces now instead of functions structured in namespaces.
Diffstat (limited to 'src/gui/equipmentwindow.cpp')
-rw-r--r--src/gui/equipmentwindow.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 46e68ef8..ef90e674 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -175,13 +175,13 @@ void EquipmentWindow::action(const gcn::ActionEvent &event)
if (event.getId() == "unequip" && mSelected > -1)
{
#ifdef TMWSERV_SUPPORT // TODO: merge these!
- player_node->unequipItem(mSelected);
+ Item *item = mEquipment->getEquipment(mSelected);
#else
- Item* item = (mSelected != EQUIP_AMMO_SLOT) ?
+ Item *item = (mSelected != EQUIP_AMMO_SLOT) ?
mInventory->getItem(mEquipment->getEquipment(mSelected)) :
mInventory->getItem(mEquipment->getArrows());
- player_node->unequipItem(item);
#endif
+ player_node->unequipItem(item);
mSelected = -1;
}
}