X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectIkari.cpp;h=22853ce725c36d76fb09f0ef8e153efc3fc9c5d0;hb=520af5a8ef4fdfd4156377d4fccd93eecd450f0f;hp=5c1a27a4ee76a781c4fc79ad1143495ac96bfe36;hpb=8d3de02319380b5142ac4c88bf54999d4027dba9;p=l2e.git

diff --git a/src/battle/states/SelectIkari.cpp b/src/battle/states/SelectIkari.cpp
index 5c1a27a..22853ce 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;
 
@@ -62,11 +59,10 @@ void SelectIkari::HandleEvents(const Input &input) {
 			if (ikari->GetTargetingMode().TargetsAlly()) {
 				ac.Selection().SelectHeroes();
 			} else {
-				ac.Selection().SelectEnemies();
+				ac.Selection().SelectMonsters();
 			}
 			if (ikari->GetTargetingMode().TargetsAll()) {
-				ac.SetType(AttackChoice::MAGIC);
-				// TODO: remove item from inventory
+				ac.SetType(AttackChoice::IKARI);
 				ac.SetItem(battle->ActiveHero().IkariMenu().Selected());
 				battle->NextHero();
 				ctrl->PopState();
@@ -111,7 +107,7 @@ 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());
+	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);
@@ -119,15 +115,15 @@ void SelectIkari::RenderFrame(SDL_Surface *screen, const Vector<int> &offset) {
 
 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);
+	res.normalFont->DrawString(res.ikariMenuHeadline, screen, position + 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->ActiveHero().IkariMenu().Draw(screen, position + offset);