X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectTarget.cpp;h=800c2335e53460cda706440e1ae0bcefc7de8858;hb=4309d259becd96ead792678257e910c03a6b4a3d;hp=f15f4558cd8ab8c32e6fe114ba7875b39036a629;hpb=0542849dfccfec1ce1477265fa0fee2401a8fb23;p=l2e.git

diff --git a/src/battle/states/SelectTarget.cpp b/src/battle/states/SelectTarget.cpp
index f15f455..800c233 100644
--- a/src/battle/states/SelectTarget.cpp
+++ b/src/battle/states/SelectTarget.cpp
@@ -1,42 +1,36 @@
-/*
- * SelectTarget.cpp
- *
- *  Created on: Aug 9, 2012
- *      Author: holy
- */
-
 #include "SelectTarget.h"
 
 #include "SelectAttackType.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 SelectTarget::EnterState(Application &c, SDL_Surface *screen) {
-	ctrl = &c;
+void SelectTarget::OnEnterState(SDL_Surface *screen) {
+
 }
 
-void SelectTarget::ExitState(Application &c, SDL_Surface *screen) {
-	ctrl = 0;
+void SelectTarget::OnExitState(SDL_Surface *screen) {
+
 }
 
-void SelectTarget::ResumeState(Application &ctrl, SDL_Surface *screen) {
+void SelectTarget::OnResumeState(SDL_Surface *screen) {
 
 }
 
-void SelectTarget::PauseState(Application &ctrl, SDL_Surface *screen) {
+void SelectTarget::OnPauseState(SDL_Surface *screen) {
 
 }
 
 
-void SelectTarget::Resize(int width, int height) {
+void SelectTarget::OnResize(int width, int height) {
 
 }
 
@@ -44,11 +38,11 @@ void SelectTarget::Resize(int width, int height) {
 void SelectTarget::HandleEvents(const Input &input) {
 	if (input.JustPressed(Input::ACTION_A)) {
 		if (selection->CurrentIsSelected()) {
-			ctrl->PopState(); // return control to parent
+			Ctrl().PopState(); // return control to parent
 		} else {
 			selection->Select();
 			if (selection->SelectSingle()) {
-				ctrl->PopState(); // return control to parent
+				Ctrl().PopState(); // return control to parent
 			}
 		}
 	}
@@ -57,7 +51,7 @@ void SelectTarget::HandleEvents(const Input &input) {
 			selection->Unselect();
 		} else {
 			selection->UnselectAll();
-			ctrl->PopState(); // return control to parent
+			Ctrl().PopState(); // return control to parent
 		}
 	}
 
@@ -75,7 +69,7 @@ void SelectTarget::HandleEvents(const Input &input) {
 	}
 }
 
-void SelectTarget::UpdateWorld(float deltaT) {
+void SelectTarget::UpdateWorld(Uint32 deltaT) {
 
 }
 
@@ -85,8 +79,7 @@ void SelectTarget::Render(SDL_Surface *screen) {
 	RenderCursors(screen, offset);
 }
 
-void SelectTarget::RenderCursors(SDL_Surface *screen, const geometry::Vector<int> &offset) {
-	// TODO: this should be related to the enemy's width
+void SelectTarget::RenderCursors(SDL_Surface *screen, const math::Vector<int> &offset) {
 	Vector<int> cursorOffset(cursorIcon->Width() / -2, cursorIcon->Height());
 	// offset the indicator by 1/8th to the right and top
 	Vector<int> indicatorOffset(cursorOffset + Vector<int>(cursorIcon->Width() / 8, cursorIcon->Height() / -8));