X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSwapHeroes.cpp;h=74770277c808eedead551aa5c5f6f49ba274f38d;hb=4309d259becd96ead792678257e910c03a6b4a3d;hp=678b5c8bfdf3b53dd1f0e180cb6661db3a74b9ad;hpb=2ccc2369d32fb680a3047519d79c17de34c4e10a;p=l2e.git

diff --git a/src/battle/states/SwapHeroes.cpp b/src/battle/states/SwapHeroes.cpp
index 678b5c8..7477027 100644
--- a/src/battle/states/SwapHeroes.cpp
+++ b/src/battle/states/SwapHeroes.cpp
@@ -1,37 +1,31 @@
-/*
- * SwapHeroes.cpp
- *
- *  Created on: Aug 10, 2012
- *      Author: holy
- */
-
 #include "SwapHeroes.h"
 
 #include "SelectMoveAction.h"
 #include "../BattleState.h"
 #include "../../app/Application.h"
 #include "../../app/Input.h"
+#include "../../math/Vector.h"
 
 using app::Application;
 using app::Input;
-using geometry::Vector;
+using math::Vector;
 using std::vector;
 
 namespace battle {
 
-void SwapHeroes::OnEnterState(Application &c, SDL_Surface *screen) {
-	ctrl = &c;
+void SwapHeroes::OnEnterState(SDL_Surface *screen) {
+
 }
 
-void SwapHeroes::OnExitState(Application &c, SDL_Surface *screen) {
-	ctrl = 0;
+void SwapHeroes::OnExitState(SDL_Surface *screen) {
+
 }
 
-void SwapHeroes::OnResumeState(Application &ctrl, SDL_Surface *screen) {
+void SwapHeroes::OnResumeState(SDL_Surface *screen) {
 
 }
 
-void SwapHeroes::OnPauseState(Application &ctrl, SDL_Surface *screen) {
+void SwapHeroes::OnPauseState(SDL_Surface *screen) {
 
 }
 
@@ -54,7 +48,7 @@ void SwapHeroes::HandleEvents(const Input &input) {
 		if (cursor == selected) {
 			selected = -1;
 		} else {
-			ctrl->PopState();
+			Ctrl().PopState();
 		}
 	}
 
@@ -110,7 +104,7 @@ void SwapHeroes::MoveLeft() {
 }
 
 
-void SwapHeroes::UpdateWorld(float deltaT) {
+void SwapHeroes::UpdateWorld(Uint32 deltaT) {
 
 }
 
@@ -120,7 +114,7 @@ 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);