From a4640305fd0d88c6332112712aa69e496368e01b Mon Sep 17 00:00:00 2001 From: Chuck Miller Date: Thu, 11 Nov 2010 23:12:29 -0500 Subject: Replace Event names with enums instead of strings --- src/gui/inventorywindow.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/gui/inventorywindow.cpp') diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index fab87844..31743c57 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -186,19 +186,19 @@ void InventoryWindow::action(const gcn::ActionEvent &event) return; if (event.getId() == "activate") - item->doEvent("doUse"); + item->doEvent(EVENT_DOUSE); else if (event.getId() == "equip") { if (item->isEquippable()) { if (item->isEquipped()) - item->doEvent("doUnequip"); + item->doEvent(EVENT_DOUNEQUIP); else - item->doEvent("doEquip"); + item->doEvent(EVENT_DOEQUIP); } else { - item->doEvent("doUse"); + item->doEvent(EVENT_DOUSE); } } else if (event.getId() == "drop") @@ -256,7 +256,7 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event) return; if (mInventory->isMainInventory()) { - Mana::Event event("doMove"); + Mana::Event event(EVENT_DOMOVE); event.setItem("item", item); event.setInt("amount", item->getQuantity()); event.setInt("source", Inventory::INVENTORY); @@ -265,7 +265,7 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event) } else { - Mana::Event event("doMove"); + Mana::Event event(EVENT_DOMOVE); event.setItem("item", item); event.setInt("amount", item->getQuantity()); event.setInt("source", Inventory::STORAGE); @@ -368,7 +368,7 @@ void InventoryWindow::close() } else { - Mana::Event event("doCloseInventory"); + Mana::Event event(EVENT_DOCLOSEINVENTORY); event.setInt("type", mInventory->getType()); event.trigger(CHANNEL_ITEM); scheduleDelete(); @@ -377,7 +377,7 @@ void InventoryWindow::close() void InventoryWindow::event(Channels channel, const Mana::Event &event) { - if (event.getName() == "UpdateAttribute") + if (event.getName() == EVENT_UPDATEATTRIBUTE) { int id = event.getInt("id"); if (id == TOTAL_WEIGHT || -- cgit v1.2.3-70-g09d2