X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmenu%2FInventoryMenu.cpp;h=c980f9719a3c120e0097f5a8c19bcb63cbdced90;hb=c5e56f45e08fcc6c4dceb586ce3d671a3f3907ab;hp=bdd94cebf5937f1b439e340f9cef7b2b365d6976;hpb=9c03a930498206bfa05de06ed838a74c8dd84a24;p=l2e.git diff --git a/src/menu/InventoryMenu.cpp b/src/menu/InventoryMenu.cpp index bdd94ce..c980f97 100644 --- a/src/menu/InventoryMenu.cpp +++ b/src/menu/InventoryMenu.cpp @@ -1,14 +1,8 @@ -/* - * InventoryMenu.cpp - * - * Created on: Nov 4, 2012 - * Author: holy - */ - #include "InventoryMenu.h" #include "PartyMenu.h" #include "Resources.h" +#include "../app/Application.h" #include "../app/Input.h" #include "../common/GameConfig.h" #include "../common/GameState.h" @@ -105,7 +99,10 @@ void InventoryMenu::HandleEvents(const Input &input) { } else if (itemMenu.SelectedIndex() == itemMenu.SecondaryIndex()) { switch (menu.Selected()) { case CHOICE_USE: - // TODO: implement item use + if (itemMenu.Selected()->CanUseOnStatusScreen()) { + // TODO: implement item use + } + itemMenu.SetActive(); break; case CHOICE_SORT: // invalid state, recover @@ -113,7 +110,11 @@ void InventoryMenu::HandleEvents(const Input &input) { itemMenu.SetInactive(); break; case CHOICE_DROP: - // TODO: implement item drop + if (itemMenu.Selected()->CanDrop()) { + parent->Game().state->inventory.RemoveAll(itemMenu.Selected()); + itemMenu.ClearEntry(itemMenu.SelectedIndex()); + } + itemMenu.SetActive(); break; } } else {