X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSwapHeroes.cpp;h=9bde2b39202a1196c632690ecc5ff216083fbf6a;hb=06db9f596cd1c5aa4c0832b387882f7c74c1b4c0;hp=568fe8857fa4e76a16a589395bae0b84cd718ce1;hpb=adb1e3d5eafba2ef3de1499be286be330afaefef;p=l2e.git

diff --git a/src/battle/states/SwapHeroes.cpp b/src/battle/states/SwapHeroes.cpp
index 568fe88..9bde2b3 100644
--- a/src/battle/states/SwapHeroes.cpp
+++ b/src/battle/states/SwapHeroes.cpp
@@ -11,35 +11,32 @@
 #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 math::Vector;
 using std::vector;
 
 namespace battle {
 
-void SwapHeroes::EnterState(Application &c, SDL_Surface *screen) {
-	ctrl = &c;
+void SwapHeroes::OnEnterState(SDL_Surface *screen) {
+
 }
 
-void SwapHeroes::ExitState(Application &c, SDL_Surface *screen) {
-	ctrl = 0;
+void SwapHeroes::OnExitState(SDL_Surface *screen) {
+
 }
 
-void SwapHeroes::ResumeState(Application &ctrl, SDL_Surface *screen) {
+void SwapHeroes::OnResumeState(SDL_Surface *screen) {
 
 }
 
-void SwapHeroes::PauseState(Application &ctrl, SDL_Surface *screen) {
+void SwapHeroes::OnPauseState(SDL_Surface *screen) {
 
 }
 
 
-void SwapHeroes::Resize(int width, int height) {
+void SwapHeroes::OnResize(int width, int height) {
 
 }
 
@@ -57,7 +54,7 @@ void SwapHeroes::HandleEvents(const Input &input) {
 		if (cursor == selected) {
 			selected = -1;
 		} else {
-			ctrl->PopState();
+			Ctrl().PopState();
 		}
 	}
 
@@ -123,11 +120,11 @@ void SwapHeroes::Render(SDL_Surface *screen) {
 	RenderCursors(screen, offset);
 }
 
-void SwapHeroes::RenderCursors(SDL_Surface *screen, const geometry::Vector<int> &offset) {
+void SwapHeroes::RenderCursors(SDL_Surface *screen, const math::Vector<int> &offset) {
 	// 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;
+	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
@@ -135,7 +132,7 @@ void SwapHeroes::RenderCursors(SDL_Surface *screen, const geometry::Vector<int>
 		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);
 			}