X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FTransitionState.cpp;h=cb26df5a3052b2a5d8470d7e941f3c0dae7572b5;hb=5d1a76ae7725af998c6ee46adfe492c68ee1d34f;hp=1a2afb50854e6a2d8485fd0b912ba09076aea06c;hpb=2ccc2369d32fb680a3047519d79c17de34c4e10a;p=l2e.git

diff --git a/src/map/TransitionState.cpp b/src/map/TransitionState.cpp
index 1a2afb5..cb26df5 100644
--- a/src/map/TransitionState.cpp
+++ b/src/map/TransitionState.cpp
@@ -1,10 +1,3 @@
-/*
- * TransitionState.cpp
- *
- *  Created on: Oct 7, 2012
- *      Author: holy
- */
-
 #include "TransitionState.h"
 
 #include "MapState.h"
@@ -13,31 +6,30 @@
 using app::Application;
 using app::State;
 using app::Input;
-using geometry::Vector;
+using math::Vector;
 
 namespace map {
 
 TransitionState::TransitionState(MapState *ms, Map *map, const Vector<int> &coordinates)
-: ctrl(0)
-, ms(ms)
+: ms(ms)
 , map(map)
 , coordinates(coordinates) {
 
 }
 
-void TransitionState::OnEnterState(Application &c, SDL_Surface *screen) {
-	ctrl = &c;
+void TransitionState::OnEnterState(SDL_Surface *screen) {
+
 }
 
-void TransitionState::OnExitState(Application &, SDL_Surface *screen) {
+void TransitionState::OnExitState(SDL_Surface *screen) {
 
 }
 
-void TransitionState::OnResumeState(Application &ctrl, SDL_Surface *screen) {
+void TransitionState::OnResumeState(SDL_Surface *screen) {
 
 }
 
-void TransitionState::OnPauseState(Application &ctrl, SDL_Surface *screen) {
+void TransitionState::OnPauseState(SDL_Surface *screen) {
 
 }
 
@@ -49,11 +41,11 @@ void TransitionState::OnResize(int width, int height) {
 
 void TransitionState::HandleEvents(const Input &input) {
 	ms->Transition(map, coordinates);
-	ctrl->PopState();
+	Ctrl().PopState();
 }
 
 
-void TransitionState::UpdateWorld(float deltaT) {
+void TransitionState::UpdateWorld(Uint32 deltaT) {
 
 }