X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FPerformAttacks.cpp;fp=src%2Fbattle%2Fstates%2FPerformAttacks.cpp;h=a01a8fe0c540dd5b3b5c611b4dff52354fd72b20;hb=0542849dfccfec1ce1477265fa0fee2401a8fb23;hp=6aae5d7401395ed3997b4c0b889440d6f280e2e6;hpb=c20927cf8ab9bb7526f641850c3997f14c66f06e;p=l2e.git

diff --git a/src/battle/states/PerformAttacks.cpp b/src/battle/states/PerformAttacks.cpp
index 6aae5d7..a01a8fe 100644
--- a/src/battle/states/PerformAttacks.cpp
+++ b/src/battle/states/PerformAttacks.cpp
@@ -15,8 +15,6 @@
 #include "../../common/Ikari.h"
 #include "../../common/Item.h"
 #include "../../common/Spell.h"
-#include "../../geometry/operators.h"
-#include "../../geometry/Point.h"
 #include "../../graphics/Animation.h"
 #include "../../graphics/Font.h"
 #include "../../graphics/Frame.h"
@@ -25,7 +23,6 @@
 
 using app::Application;
 using app::Input;
-using geometry::Point;
 using geometry::Vector;
 using graphics::AnimationRunner;
 using std::vector;
@@ -231,9 +228,9 @@ void PerformAttacks::RenderTitleBar(SDL_Surface *screen, const Vector<int> &offs
 	if (!titleBarText || !titleBarTimer.Running()) return;
 
 	int height(battle->Res().titleFrame->BorderHeight() * 2 + battle->Res().titleFont->CharHeight());
-	battle->Res().titleFrame->Draw(screen, Point<int>(offset.X(), offset.Y()), battle->Width(), height);
+	battle->Res().titleFrame->Draw(screen, Vector<int>(offset.X(), offset.Y()), battle->Width(), height);
 
-	Point<int> textPosition(
+	Vector<int> textPosition(
 			(battle->Width() - (std::strlen(titleBarText) * battle->Res().titleFont->CharWidth())) / 2,
 			battle->Res().titleFrame->BorderHeight());
 	battle->Res().titleFont->DrawString(titleBarText, screen, textPosition + offset);
@@ -252,13 +249,13 @@ void PerformAttacks::RenderTargetAnimation(SDL_Surface *screen, const geometry::
 	if (!targetAnimation.Valid() || !targetAnimation.Running()) return;
 	const TargetSelection &ts(battle->CurrentAttackAttackChoice().Selection());
 	if (ts.TargetsHeroes()) {
-		for (vector<Point<int> >::size_type i(0), end(battle->NumHeroes()); i < end; ++i) {
+		for (vector<Vector<int> >::size_type i(0), end(battle->NumHeroes()); i < end; ++i) {
 			if (ts.IsSelected(i)) {
 				targetAnimation.DrawCenter(screen, battle->HeroAt(i).Position() + offset);
 			}
 		}
 	} else {
-		for (vector<Point<int> >::size_type i(0), end(battle->MaxMonsters()); i < end; ++i) {
+		for (vector<Vector<int> >::size_type i(0), end(battle->MaxMonsters()); i < end; ++i) {
 			if (ts.IsSelected(i)) {
 				targetAnimation.DrawCenter(screen, battle->MonsterAt(i).Position() + offset);
 			}