X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectItem.cpp;h=a8c23bb763a9acaf9682dfd841044ae33d3bf8f6;hb=76539c6ba0ac1bc6ecd179cd0fc229f40872598b;hp=97dd63fc33a53d90c32882ba37bba7e2f462d3c0;hpb=d872d756e64b8f1f57cba64ae19f479f8eab3927;p=l2e.git

diff --git a/src/battle/states/SelectItem.cpp b/src/battle/states/SelectItem.cpp
index 97dd63f..a8c23bb 100644
--- a/src/battle/states/SelectItem.cpp
+++ b/src/battle/states/SelectItem.cpp
@@ -36,6 +36,8 @@ void SelectItem::ExitState(Application &c, SDL_Surface *screen) {
 
 void SelectItem::ResumeState(Application &ctrl, SDL_Surface *screen) {
 	if (battle->ActiveHeroTargets().HasSelected()) {
+		battle->SetAttackType(AttackChoice::ITEM);
+		battle->ActiveHeroAttackChoice().SetItem(battle->GetItemMenu().Selected());
 		ctrl.PopState();
 	}
 }
@@ -50,7 +52,7 @@ 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());
@@ -74,9 +76,6 @@ void SelectItem::HandleInput(const Input &input) {
 				}
 				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)) {