X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FTransitionState.cpp;h=4490f83b37b0170d2bc22b2f8d22250ad165e2f6;hb=5ff22859ee5966297862d3384206fa2cf52da7ca;hp=75a4deaa540b86ea3d9727175a12ff04c1eff106;hpb=65158353d1ecbed0032752863c6c4eb96b1a084a;p=l2e.git diff --git a/src/map/TransitionState.cpp b/src/map/TransitionState.cpp index 75a4dea..4490f83 100644 --- a/src/map/TransitionState.cpp +++ b/src/map/TransitionState.cpp @@ -18,38 +18,37 @@ using geometry::Vector; namespace map { TransitionState::TransitionState(MapState *ms, Map *map, const Vector &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) { } -void TransitionState::Resize(int width, int height) { +void TransitionState::OnResize(int width, int height) { } void TransitionState::HandleEvents(const Input &input) { ms->Transition(map, coordinates); - ctrl->PopState(); + Ctrl().PopState(); }