X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectAttackType.cpp;h=4bac0bbe50cf1d8ebf7a827f042e14588bd304cb;hb=2147d00bbcb43f5cb4499091f646057cb6944cb3;hp=f8ad21d54d9fb9a3ebe52f1fc3dc48eb6d048f0a;hpb=8f6a2452408f4ae35396cd7008a6fab0ecb03a46;p=l2e.git

diff --git a/src/battle/states/SelectAttackType.cpp b/src/battle/states/SelectAttackType.cpp
index f8ad21d..4bac0bb 100644
--- a/src/battle/states/SelectAttackType.cpp
+++ b/src/battle/states/SelectAttackType.cpp
@@ -36,8 +36,8 @@ void SelectAttackType::ExitState(Application &c, SDL_Surface *screen) {
 }
 
 void SelectAttackType::ResumeState(Application &ctrl, SDL_Surface *screen) {
-	if (battle->ActiveHeroAttackChoice().Selection().HasSelected()) {
-		battle->ActiveHeroAttackChoice().SetType(battle->GetAttackTypeMenu().Selected());
+	if (battle->ActiveHero().GetAttackChoice().Selection().HasSelected()) {
+		battle->ActiveHero().GetAttackChoice().SetType(battle->GetAttackTypeMenu().Selected());
 		battle->NextHero();
 	}
 	if (battle->AttackSelectionDone()) {
@@ -73,9 +73,9 @@ void SelectAttackType::HandleEvents(const Input &input) {
 		switch (battle->GetAttackTypeMenu().Selected()) {
 			case AttackChoice::SWORD:
 				// TODO: detect single/multiple/all attack mode
-				battle->ActiveHeroAttackChoice().Selection().SetSingle();
-				battle->ActiveHeroAttackChoice().Selection().Reset();
-				ctrl->PushState(new SelectTarget(battle, this, &battle->ActiveHeroAttackChoice().Selection(), battle->Res().weaponTargetCursor));
+				battle->ActiveHero().GetAttackChoice().Selection().SetSingle();
+				battle->ActiveHero().GetAttackChoice().Selection().Reset();
+				ctrl->PushState(new SelectTarget(battle, this, &battle->ActiveHero().GetAttackChoice().Selection(), battle->Res().weaponTargetCursor));
 				break;
 			case AttackChoice::MAGIC:
 				if (battle->ActiveHero().CanUseMagic()) {
@@ -83,7 +83,7 @@ void SelectAttackType::HandleEvents(const Input &input) {
 				}
 				break;
 			case AttackChoice::DEFEND:
-				battle->ActiveHeroAttackChoice().SetType(AttackChoice::DEFEND);
+				battle->ActiveHero().GetAttackChoice().SetType(AttackChoice::DEFEND);
 				battle->NextHero();
 				break;
 			case AttackChoice::IKARI:
@@ -96,17 +96,16 @@ void SelectAttackType::HandleEvents(const Input &input) {
 				throw std::logic_error("selected invalid attack type");
 		}
 	} else if (input.JustPressed(Input::ACTION_B)) {
-		battle->ActiveHeroAttackChoice().Reset();
+		battle->ActiveHero().GetAttackChoice().Reset();
 		battle->PreviousHero();
 		if (battle->BeforeFirstHero()) {
 			ctrl->ChangeState(new SelectMoveAction(battle));
 		} else {
-			battle->ActiveHeroAttackChoice().Reset();
+			battle->ActiveHero().GetAttackChoice().Reset();
 		}
 	}
 
 	if (battle->AttackSelectionDone()) {
-		// TODO: switch to battle animation instead
 		ctrl->PopState();
 	}
 }