X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectItem.cpp;h=4701fb94c2a3efbdce8232b698694eb966b419f5;hb=923422e6a71f57b8fa24b826d1e2914faa144081;hp=a2d178eb251f83db906d7c662ddf34c3606c6322;hpb=b7a90738b9ae701cfc86bf74a11ba59d7fcb17ba;p=l2e.git

diff --git a/src/battle/states/SelectItem.cpp b/src/battle/states/SelectItem.cpp
index a2d178e..4701fb9 100644
--- a/src/battle/states/SelectItem.cpp
+++ b/src/battle/states/SelectItem.cpp
@@ -50,33 +50,30 @@ void SelectItem::Resize(int width, int height) {
 }
 
 
-void SelectItem::HandleInput(const Input &input) {
+void SelectItem::HandleEvents(const Input &input) {
 	if (input.JustPressed(Input::ACTION_A)) {
 		if (battle->GetItemMenu().SelectedIsEnabled()) {
 			const Item *item(battle->GetItemMenu().Selected());
 			battle->ActiveHeroTargets().Reset();
-			if (item->TargetAlly()) {
+			if (item->GetTargetingMode().TargetsAlly()) {
 				battle->ActiveHeroTargets().SelectHeroes();
 			} else {
 				battle->ActiveHeroTargets().SelectEnemies();
 			}
-			if (item->TargetAll()) {
+			if (item->GetTargetingMode().TargetsAll()) {
 				battle->SetAttackType(AttackChoice::ITEM);
 				// TODO: remove item from inventory
 				battle->ActiveHeroAttackChoice().SetItem(item);
 				battle->NextHero();
 				ctrl->PopState();
 			} else {
-				if (item->TargetOne()) {
+				if (item->GetTargetingMode().TargetsSingle()) {
 					battle->ActiveHeroTargets().SetSingle();
 				} else {
 					battle->ActiveHeroTargets().SetMultiple();
 				}
 				ctrl->PushState(new SelectTarget(battle, parent, &battle->ActiveHeroTargets(), battle->Res().itemTargetCursor));
 			}
-//			battle->SetAttackType(AttackChoice::ITEM);
-//			battle->NextHero();
-//			ctrl->PopState();
 		}
 	}
 	if (input.JustPressed(Input::ACTION_B)) {