summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-04-28 12:43:10 -0600
committerJared Adams <jaxad0127@gmail.com>2009-04-28 12:43:52 -0600
commit0a2abc874b25d2daba54e70b3a08080e1223f6ba (patch)
tree03cf1109a00aab3fefad74e7efa22a312f1596ef
parentc6ecbbecfeffe935a77bd79754cb59fbd1446a3e (diff)
downloadmana-0a2abc874b25d2daba54e70b3a08080e1223f6ba.tar.gz
mana-0a2abc874b25d2daba54e70b3a08080e1223f6ba.tar.bz2
mana-0a2abc874b25d2daba54e70b3a08080e1223f6ba.tar.xz
mana-0a2abc874b25d2daba54e70b3a08080e1223f6ba.zip
Remove some more support #ifdefs
-rw-r--r--src/gui/inventorywindow.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index c73a12ea..33115f96 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -77,10 +77,8 @@ InventoryWindow::InventoryWindow(int invSize):
mDropButton = new Button(_("Drop"), "drop", this);
#ifdef TMWSERV_SUPPORT
mSplitButton = new Button(_("Split"), "split", this);
- mItems = new ItemContainer(player_node->getInventory());
-#else
- mItems = new ItemContainer(player_node->getInventory());
#endif
+ mItems = new ItemContainer(player_node->getInventory());
mItems->addSelectionListener(this);
gcn::ScrollArea *invenScroll = new ScrollArea(mItems);
@@ -167,14 +165,10 @@ void InventoryWindow::action(const gcn::ActionEvent &event)
if (event.getId() == "use")
{
if (item->isEquipment()) {
-#ifdef TMWSERV_SUPPORT
- player_node->equipItem(item);
-#else
if (item->isEquipped())
player_node->unequipItem(item);
else
player_node->equipItem(item);
-#endif
}
else
player_node->useItem(item);
@@ -268,11 +262,9 @@ void InventoryWindow::updateButtons()
if (selectedItem && selectedItem->isEquipment())
{
-#ifdef EATHENA_SUPPORT
if (selectedItem->isEquipped())
mUseButton->setCaption(_("Unequip"));
else
-#endif
mUseButton->setCaption(_("Equip"));
}
else