diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-10-04 17:38:19 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-10-04 17:38:19 +0300 |
commit | 65a88f27b994f7ade178368c569d466f6344ded6 (patch) | |
tree | 1b4bae38055b1ce31201ebb72b5c10987cba9f62 /src/gui/windows/inventorywindow.cpp | |
parent | a553b3cda91aa095d88e22abcaa81701c2894334 (diff) | |
download | plus-65a88f27b994f7ade178368c569d466f6344ded6.tar.gz plus-65a88f27b994f7ade178368c569d466f6344ded6.tar.bz2 plus-65a88f27b994f7ade178368c569d466f6344ded6.tar.xz plus-65a88f27b994f7ade178368c569d466f6344ded6.zip |
add sound effects for equip/unequip/use items for local player.
It using: "equip", "unequip", "use" effects from items.
If no item effect present, fallback to same effects from player race.
Diffstat (limited to 'src/gui/windows/inventorywindow.cpp')
-rw-r--r-- | src/gui/windows/inventorywindow.cpp | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index 99d4d4954..0cc9b4e0e 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -358,11 +358,11 @@ void InventoryWindow::action(const gcn::ActionEvent &event) if (eventId == "use") { - PlayerInfo::useEquipItem(item); + PlayerInfo::useEquipItem(item, true); } if (eventId == "equip") { - PlayerInfo::useEquipItem2(item); + PlayerInfo::useEquipItem2(item, true); } else if (eventId == "drop") { @@ -524,19 +524,7 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event) } else { - if (item->isEquipment()) - { - if (item->isEquipped()) - PlayerInfo::unequipItem(item); - else - PlayerInfo::equipItem(item); - } - else - { - if (PlayerInfo::isItemProtected(item->getId())) - return; - PlayerInfo::useItem(item); - } + PlayerInfo::useEquipItem(item, true); } } else |