X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectSpell.cpp;h=65cd8ccdc70173c2ab0e9106588ca249a6fb705f;hb=0542849dfccfec1ce1477265fa0fee2401a8fb23;hp=0708196b7b0cfde37de92974785e70499e7719f6;hpb=8d3de02319380b5142ac4c88bf54999d4027dba9;p=l2e.git

diff --git a/src/battle/states/SelectSpell.cpp b/src/battle/states/SelectSpell.cpp
index 0708196..65cd8cc 100644
--- a/src/battle/states/SelectSpell.cpp
+++ b/src/battle/states/SelectSpell.cpp
@@ -14,14 +14,11 @@
 #include "../../app/Application.h"
 #include "../../app/Input.h"
 #include "../../common/Spell.h"
-#include "../../geometry/operators.h"
-#include "../../geometry/Point.h"
 #include "../../graphics/Frame.h"
 
 using app::Application;
 using app::Input;
 using common::Spell;
-using geometry::Point;
 using geometry::Vector;
 using graphics::Frame;
 
@@ -62,7 +59,7 @@ void SelectSpell::HandleEvents(const Input &input) {
 			if (spell->GetTargetingMode().TargetsAlly()) {
 				ac.Selection().SelectHeroes();
 			} else {
-				ac.Selection().SelectEnemies();
+				ac.Selection().SelectMonsters();
 			}
 			if (spell->GetTargetingMode().TargetsAll()) {
 				ac.SetType(AttackChoice::MAGIC);
@@ -111,7 +108,7 @@ void SelectSpell::Render(SDL_Surface *screen) {
 
 void SelectSpell::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->BorderWidth(), frame->BorderHeight());
 	int width(battle->Width() - 2 * frame->BorderWidth());
 	int height(battle->Res().normalFont->CharHeight() * 13);
 	frame->Draw(screen, position + offset, width, height);
@@ -119,7 +116,7 @@ void SelectSpell::RenderFrame(SDL_Surface *screen, const Vector<int> &offset) {
 
 void SelectSpell::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.spellMenuHeadline, screen, position + offset);
@@ -127,7 +124,7 @@ void SelectSpell::RenderHeadline(SDL_Surface *screen, const Vector<int> &offset)
 
 void SelectSpell::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().SpellMenu().Draw(screen, position + offset);