X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectAttackType.cpp;h=9f6e561be43fadea59adcd44eeec6ea0ea022a65;hb=a3ba4dc677ad7c92eeb78b20b642241563605c9d;hp=c0073208195e923086eeadb9f744a5764545cdda;hpb=3c72a71fbf6de96333a641051a20c6bf8b3a5df3;p=l2e.git

diff --git a/src/battle/states/SelectAttackType.cpp b/src/battle/states/SelectAttackType.cpp
index c007320..9f6e561 100644
--- a/src/battle/states/SelectAttackType.cpp
+++ b/src/battle/states/SelectAttackType.cpp
@@ -16,47 +16,47 @@
 #include "../BattleState.h"
 #include "../../app/Application.h"
 #include "../../app/Input.h"
-#include "../../geometry/operators.h"
+#include "../../common/Item.h"
 
 #include <stdexcept>
 
 using app::Application;
 using app::Input;
-using geometry::Point;
-using geometry::Vector;
+using common::Item;
+using math::Vector;
 
 namespace battle {
 
-void SelectAttackType::EnterState(Application &c, SDL_Surface *screen) {
-	ctrl = &c;
+void SelectAttackType::OnEnterState(SDL_Surface *screen) {
+
 }
 
-void SelectAttackType::ExitState(Application &c, SDL_Surface *screen) {
-	ctrl = 0;
+void SelectAttackType::OnExitState(SDL_Surface *screen) {
+
 }
 
-void SelectAttackType::ResumeState(Application &ctrl, SDL_Surface *screen) {
-	if (battle->ActiveHeroTargets().HasSelected()) {
-		battle->SetAttackType(battle->GetAttackTypeMenu().Selected());
+void SelectAttackType::OnResumeState(SDL_Surface *screen) {
+	if (battle->ActiveHero().GetAttackChoice().Selection().HasSelected()) {
+		battle->ActiveHero().GetAttackChoice().SetType(battle->GetAttackTypeMenu().Selected());
 		battle->NextHero();
 	}
 	if (battle->AttackSelectionDone()) {
 		// pass through
-		ctrl.PopState();
+		Ctrl().PopState();
 	}
 }
 
-void SelectAttackType::PauseState(Application &ctrl, SDL_Surface *screen) {
+void SelectAttackType::OnPauseState(SDL_Surface *screen) {
 
 }
 
 
-void SelectAttackType::Resize(int width, int height) {
+void SelectAttackType::OnResize(int width, int height) {
 
 }
 
 
-void SelectAttackType::HandleInput(const Input &input) {
+void SelectAttackType::HandleEvents(const Input &input) {
 	if (input.IsDown(Input::PAD_UP)) {
 		battle->GetAttackTypeMenu().Select(AttackChoice::MAGIC);
 	} else if (input.IsDown(Input::PAD_RIGHT)) {
@@ -69,43 +69,55 @@ void SelectAttackType::HandleInput(const Input &input) {
 		battle->GetAttackTypeMenu().Select(AttackChoice::SWORD);
 	}
 
+	Hero &hero(battle->ActiveHero());
+	AttackChoice &ac(hero.GetAttackChoice());
 	if (input.JustPressed(Input::ACTION_A)) {
 		switch (battle->GetAttackTypeMenu().Selected()) {
 			case AttackChoice::SWORD:
-				// TODO: detect single/multiple/all attack mode
-				battle->ActiveHeroTargets().SetSingle();
-				battle->ActiveHeroTargets().Reset();
-				ctrl->PushState(new SelectTarget(battle, this, &battle->ActiveHeroTargets(), battle->Res().weaponTargetCursor, true));
+				if (hero.HasWeapon()) {
+					if (hero.Weapon()->GetTargetingMode().TargetsAll()) {
+						ac.SetType(AttackChoice::SWORD);
+						battle->NextHero();
+						break;
+					} else {
+						ac.Selection().ReadMode(hero.Weapon()->GetTargetingMode());
+					}
+				} else {
+					ac.Selection().SetSingle();
+				}
+				ac.Selection().Reset();
+				Ctrl().PushState(new SelectTarget(battle, this, &ac.Selection(), battle->Res().weaponTargetCursor));
 				break;
 			case AttackChoice::MAGIC:
 				if (battle->ActiveHero().CanUseMagic()) {
-					ctrl->PushState(new SelectSpell(battle, this));
+					Ctrl().PushState(new SelectSpell(battle, this));
 				}
 				break;
 			case AttackChoice::DEFEND:
-				battle->SetAttackType(AttackChoice::DEFEND);
+				ac.SetType(AttackChoice::DEFEND);
 				battle->NextHero();
 				break;
 			case AttackChoice::IKARI:
-				ctrl->PushState(new SelectIkari(battle, this));
+				Ctrl().PushState(new SelectIkari(battle, this));
 				break;
 			case AttackChoice::ITEM:
-				ctrl->PushState(new SelectItem(battle, this));
+				Ctrl().PushState(new SelectItem(battle, this));
 				break;
 			default:
 				throw std::logic_error("selected invalid attack type");
 		}
 	} else if (input.JustPressed(Input::ACTION_B)) {
+		ac.Reset();
 		battle->PreviousHero();
-		battle->SetAttackType(AttackChoice::UNDECIDED);
 		if (battle->BeforeFirstHero()) {
-			ctrl->ChangeState(new SelectMoveAction(battle));
+			Ctrl().ChangeState(new SelectMoveAction(battle));
+		} else {
+			battle->ActiveHero().GetAttackChoice().Reset();
 		}
 	}
 
 	if (battle->AttackSelectionDone()) {
-		// TODO: switch to battle animation instead
-		ctrl->PopState();
+		Ctrl().PopState();
 	}
 }
 
@@ -122,9 +134,9 @@ void SelectAttackType::Render(SDL_Surface *screen) {
 }
 
 void SelectAttackType::RenderMenu(SDL_Surface *screen, const Vector<int> &offset) {
-	Point<int> position(
-			(battle->BackgroundWidth() - battle->GetAttackTypeMenu().Width()) / 2,
-			battle->BackgroundHeight() - battle->GetAttackTypeMenu().Height() - battle->GetAttackTypeMenu().Height() / 2);
+	Vector<int> position(
+			(battle->Width() - battle->GetAttackTypeMenu().Width()) / 2,
+			battle->Height() - battle->GetAttackTypeMenu().Height() - battle->GetAttackTypeMenu().Height() / 2);
 	battle->GetAttackTypeMenu().Render(screen, position + offset);
 }