X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FRunState.cpp;h=311e0f35c3cc8b8c7aba89350901da1c762a3e92;hb=67f6bb1d9727e7d1e2140cf2913aa89ebba84bf5;hp=e1f6f4bcdd89058dc65b260849202e872606df54;hpb=d20fa78a0dcbc95a69bb6077d2081d42b74a2d1a;p=l2e.git

diff --git a/src/battle/states/RunState.cpp b/src/battle/states/RunState.cpp
index e1f6f4b..311e0f3 100644
--- a/src/battle/states/RunState.cpp
+++ b/src/battle/states/RunState.cpp
@@ -22,25 +22,24 @@ using geometry::Vector;
 
 namespace battle {
 
-void RunState::EnterState(Application &c, SDL_Surface *screen) {
-	ctrl = &c;
-	// TODO: push battle animation if enemy is faster
+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) {
 
 }
 
@@ -48,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
 	}
 }