X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FTransitionState.cpp;h=dd1dbc5c9a98445ba384b5ae6201908d2bf9f8c6;hb=7f0a586b8238c7093a8942ff5b5c4122edd386fc;hp=9a1d699f6582c44fd4b6b7ecf3e0f10b86e60bbf;hpb=e02068d51f5e7f82d4d3195e9a9ce5c9d76f727d;p=l2e.git diff --git a/src/map/TransitionState.cpp b/src/map/TransitionState.cpp index 9a1d699..dd1dbc5 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" @@ -18,38 +11,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::EnterState(Application &c, SDL_Surface *screen) { - ctrl = &c; +void TransitionState::OnEnterState(SDL_Surface *screen) { + } -void TransitionState::ExitState(Application &, SDL_Surface *screen) { +void TransitionState::OnExitState(SDL_Surface *screen) { } -void TransitionState::ResumeState(Application &ctrl, SDL_Surface *screen) { +void TransitionState::OnResumeState(SDL_Surface *screen) { } -void TransitionState::PauseState(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(); }