X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectIkari.cpp;h=87436b0faad8d862a58f82f185013d309a8f4fc9;hb=d20fa78a0dcbc95a69bb6077d2081d42b74a2d1a;hp=605ba2caef9ea52670ee5e898b4bea3bb29dab4a;hpb=222167ba3722dc7f47ff7510006bd516e0010a50;p=l2e.git

diff --git a/src/battle/states/SelectIkari.cpp b/src/battle/states/SelectIkari.cpp
index 605ba2c..87436b0 100644
--- a/src/battle/states/SelectIkari.cpp
+++ b/src/battle/states/SelectIkari.cpp
@@ -14,14 +14,11 @@
 #include "../../app/Input.h"
 #include "../../common/Ikari.h"
 #include "../../common/Item.h"
-#include "../../geometry/Point.h"
-#include "../../geometry/operators.h"
 #include "../../graphics/Frame.h"
 
 using app::Application;
 using app::Input;
 using common::Ikari;
-using geometry::Point;
 using geometry::Vector;
 using graphics::Frame;
 
@@ -36,9 +33,9 @@ void SelectIkari::ExitState(Application &c, SDL_Surface *screen) {
 }
 
 void SelectIkari::ResumeState(Application &ctrl, SDL_Surface *screen) {
-	if (battle->ActiveHeroTargets().HasSelected()) {
-		battle->SetAttackType(AttackChoice::IKARI);
-		battle->ActiveHeroAttackChoice().SetItem(battle->GetIkariMenu().Selected());
+	if (battle->ActiveHero().GetAttackChoice().Selection().HasSelected()) {
+		battle->ActiveHero().GetAttackChoice().SetType(AttackChoice::IKARI);
+		battle->ActiveHero().GetAttackChoice().SetItem(battle->ActiveHero().IkariMenu().Selected());
 		ctrl.PopState();
 	}
 }
@@ -55,27 +52,28 @@ void SelectIkari::Resize(int width, int height) {
 
 void SelectIkari::HandleEvents(const Input &input) {
 	if (input.JustPressed(Input::ACTION_A)) {
-		if (battle->GetIkariMenu().SelectedIsEnabled() && battle->GetIkariMenu().Selected()->HasIkari()) {
-			const Ikari *ikari(battle->GetIkariMenu().Selected()->GetIkari());
-			battle->ActiveHeroTargets().Reset();
+		if (battle->ActiveHero().IkariMenu().SelectedIsEnabled() && battle->ActiveHero().IkariMenu().Selected()->HasIkari()) {
+			AttackChoice &ac(battle->ActiveHero().GetAttackChoice());
+			const Ikari *ikari(battle->ActiveHero().IkariMenu().Selected()->GetIkari());
+			ac.Selection().Reset();
 			if (ikari->GetTargetingMode().TargetsAlly()) {
-				battle->ActiveHeroTargets().SelectHeroes();
+				ac.Selection().SelectHeroes();
 			} else {
-				battle->ActiveHeroTargets().SelectEnemies();
+				ac.Selection().SelectMonsters();
 			}
 			if (ikari->GetTargetingMode().TargetsAll()) {
-				battle->SetAttackType(AttackChoice::MAGIC);
+				ac.SetType(AttackChoice::MAGIC);
 				// TODO: remove item from inventory
-				battle->ActiveHeroAttackChoice().SetItem(battle->GetIkariMenu().Selected());
+				ac.SetItem(battle->ActiveHero().IkariMenu().Selected());
 				battle->NextHero();
 				ctrl->PopState();
 			} else {
 				if (ikari->GetTargetingMode().TargetsSingle()) {
-					battle->ActiveHeroTargets().SetSingle();
+					ac.Selection().SetSingle();
 				} else {
-					battle->ActiveHeroTargets().SetMultiple();
+					ac.Selection().SetMultiple();
 				}
-				ctrl->PushState(new SelectTarget(battle, parent, &battle->ActiveHeroTargets(), ikari->IsMagical() ? battle->Res().magicTargetCursor : battle->Res().weaponTargetCursor));
+				ctrl->PushState(new SelectTarget(battle, parent, &ac.Selection(), ikari->IsMagical() ? battle->Res().magicTargetCursor : battle->Res().weaponTargetCursor));
 			}
 		}
 	}
@@ -83,16 +81,16 @@ void SelectIkari::HandleEvents(const Input &input) {
 		ctrl->PopState(); // return control to parent
 	}
 	if (input.JustPressed(Input::PAD_UP)) {
-		battle->GetIkariMenu().PreviousRow();
+		battle->ActiveHero().IkariMenu().PreviousRow();
 	}
 	if (input.JustPressed(Input::PAD_RIGHT)) {
-		battle->GetIkariMenu().NextItem();
+		battle->ActiveHero().IkariMenu().NextItem();
 	}
 	if (input.JustPressed(Input::PAD_DOWN)) {
-		battle->GetIkariMenu().NextRow();
+		battle->ActiveHero().IkariMenu().NextRow();
 	}
 	if (input.JustPressed(Input::PAD_LEFT)) {
-		battle->GetIkariMenu().PreviousItem();
+		battle->ActiveHero().IkariMenu().PreviousItem();
 	}
 }
 
@@ -110,15 +108,15 @@ void SelectIkari::Render(SDL_Surface *screen) {
 
 void SelectIkari::RenderFrame(SDL_Surface *screen, const Vector<int> &offset) {
 	const Frame *frame(battle->Res().selectFrame);
-	Point<int> position(frame->BorderWidth(), frame->BorderHeight());
-	int width(battle->BackgroundWidth() - 2 * frame->BorderWidth());
+	Vector<int> position(frame->BorderSize());
+	int width(battle->Width() - 2 * frame->BorderWidth());
 	int height(battle->Res().normalFont->CharHeight() * 13);
 	frame->Draw(screen, position + offset, width, height);
 }
 
 void SelectIkari::RenderHeadline(SDL_Surface *screen, const Vector<int> &offset) {
 	const Resources &res(battle->Res());
-	Point<int> position(
+	Vector<int> position(
 			2 * res.selectFrame->BorderWidth() + res.normalFont->CharWidth(),
 			2 * res.selectFrame->BorderHeight());
 	res.normalFont->DrawString(res.itemMenuHeadline, screen, position + offset);
@@ -126,10 +124,10 @@ void SelectIkari::RenderHeadline(SDL_Surface *screen, const Vector<int> &offset)
 
 void SelectIkari::RenderMenu(SDL_Surface *screen, const Vector<int> &offset) {
 	const Resources &res(battle->Res());
-	Point<int> position(
+	Vector<int> position(
 			2 * res.selectFrame->BorderWidth() + res.normalFont->CharWidth(),
 			2 * res.selectFrame->BorderHeight() + 2 * res.normalFont->CharHeight());
-	battle->GetIkariMenu().Draw(screen, position + offset);
+	battle->ActiveHero().IkariMenu().Draw(screen, position + offset);
 }
 
 }