X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FRunState.cpp;h=311e0f35c3cc8b8c7aba89350901da1c762a3e92;hb=60e0fe29ce6cd033edc78b181d9d07fa72c11172;hp=c75255c3d1edf51e9cd461066fdfd0c7ea2885d9;hpb=70641f2eb3f9fce8c89dcbf345e202050609a142;p=l2e.git diff --git a/src/battle/states/RunState.cpp b/src/battle/states/RunState.cpp index c75255c..311e0f3 100644 --- a/src/battle/states/RunState.cpp +++ b/src/battle/states/RunState.cpp @@ -22,24 +22,24 @@ using geometry::Vector; namespace battle { -void RunState::EnterState(Application &c, SDL_Surface *screen) { - ctrl = &c; +void RunState::OnEnterState(SDL_Surface *screen) { + } -void RunState::ExitState(Application &c, SDL_Surface *screen) { - ctrl = 0; +void RunState::OnExitState(SDL_Surface *screen) { + } -void RunState::ResumeState(Application &ctrl, SDL_Surface *screen) { +void RunState::OnResumeState(SDL_Surface *screen) { timer = GraphicsTimers().StartCountdown(2500); } -void RunState::PauseState(Application &ctrl, SDL_Surface *screen) { +void RunState::OnPauseState(SDL_Surface *screen) { } -void RunState::Resize(int width, int height) { +void RunState::OnResize(int width, int height) { } @@ -47,7 +47,7 @@ void RunState::Resize(int width, int height) { void RunState::HandleEvents(const Input &input) { if (timer.Finished()) { battle->SetRunaway(); - ctrl->PopState(); // pop self + Ctrl().PopState(); // pop self } }