X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FPerformAttacks.cpp;h=19fccb08d7384539add191705bfc160c5f097d9b;hb=d20fa78a0dcbc95a69bb6077d2081d42b74a2d1a;hp=44831791d2c749695cc83716d099178c6f552f67;hpb=9718062e6ed305d9f8f1674ff172079688e78088;p=l2e.git

diff --git a/src/battle/states/PerformAttacks.cpp b/src/battle/states/PerformAttacks.cpp
index 4483179..19fccb0 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;
@@ -140,7 +137,7 @@ void PerformAttacks::HandleEvents(const Input &input) {
 }
 
 void PerformAttacks::AddNumberAnimations(const TargetSelection &ts) {
-	if (ts.TargetsEnemies()) {
+	if (ts.TargetsMonsters()) {
 		for (int i(0); i < battle->MaxMonsters(); ++i) {
 			if (ts.IsBad(i)) {
 				numberAnimation.push_back(NumberAnimation(ts.GetAmount(i), battle->Res().numberAnimationPrototype, battle->Res().bigNumberSprite));
@@ -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, offset, 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);
 			}