X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSwapHeroes.cpp;h=0feb7e9a59ac04a18288e04348cf4e7d730b5b6f;hb=65158353d1ecbed0032752863c6c4eb96b1a084a;hp=f01e60da8603f862f97ad541a321d24c0bad750d;hpb=6d080d21d8055df9962296863b4c0954bc81410b;p=l2e.git

diff --git a/src/battle/states/SwapHeroes.cpp b/src/battle/states/SwapHeroes.cpp
index f01e60d..0feb7e9 100644
--- a/src/battle/states/SwapHeroes.cpp
+++ b/src/battle/states/SwapHeroes.cpp
@@ -11,30 +11,27 @@
 #include "../BattleState.h"
 #include "../../app/Application.h"
 #include "../../app/Input.h"
-#include "../../geometry/operators.h"
-#include "../../geometry/Point.h"
 
 using app::Application;
 using app::Input;
-using geometry::Point;
 using geometry::Vector;
 using std::vector;
 
 namespace battle {
 
-void SwapHeroes::EnterState(Application &c, SDL_Surface *screen) {
+void SwapHeroes::OnEnterState(Application &c, SDL_Surface *screen) {
 	ctrl = &c;
 }
 
-void SwapHeroes::ExitState(Application &c, SDL_Surface *screen) {
+void SwapHeroes::OnExitState(Application &c, SDL_Surface *screen) {
 	ctrl = 0;
 }
 
-void SwapHeroes::ResumeState(Application &ctrl, SDL_Surface *screen) {
+void SwapHeroes::OnResumeState(Application &ctrl, SDL_Surface *screen) {
 
 }
 
-void SwapHeroes::PauseState(Application &ctrl, SDL_Surface *screen) {
+void SwapHeroes::OnPauseState(Application &ctrl, SDL_Surface *screen) {
 
 }
 
@@ -108,7 +105,7 @@ void SwapHeroes::MoveLeft() {
 	if (cursor > 0) {
 		--cursor;
 	} else {
-		cursor = battle->Heroes().size();
+		cursor = battle->NumHeroes();
 	}
 }
 
@@ -127,15 +124,15 @@ void SwapHeroes::RenderCursors(SDL_Surface *screen, const geometry::Vector<int>
 	// offset the cursor by 1/8th to the left and bottom
 	Vector<int> cursorOffset(battle->Res().swapCursor->Width() / -8, battle->Res().swapCursor->Height() / 8);
 	Vector<int> indicatorOffset(0, 0);
-	vector<Point<int> > positions;
-	for (vector<Hero>::size_type i(0), end(battle->Heroes().size()); i < end; ++i) {
+	vector<Vector<int> > positions;
+	for (int i(0), end(battle->NumHeroes()); i < end; ++i) {
 		Vector<int> positionCorrection(battle->Res().swapCursor->Width() / 2, battle->HeroTagAt(i).HeroSprite()->Height() - battle->Res().swapCursor->Height() / 2);
 		// indicator offsets are inverted for heroes
 		positionCorrection -= cursorOffset;
 		positions.push_back(battle->HeroTagPositionAt(i) + battle->HeroTagAt(i).HeroOffset() + positionCorrection);
 	}
 	if (flipFlop) {
-		for (vector<Point<int> >::size_type i(0); i < positions.size(); ++i) {
+		for (vector<Vector<int> >::size_type i(0); i < positions.size(); ++i) {
 			if (selected == int(i)) {
 				battle->Res().swapCursor->DrawTopRight(screen, positions[i] + offset);
 			}