X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FApplication.cpp;h=b84d7248da1a465b7eafa557cc85c0d393b6789f;hb=2ccc2369d32fb680a3047519d79c17de34c4e10a;hp=f773cfcec71f96252c9da4cad9275e8096016bc9;hpb=ede708d4e15a34a4443727fc64fd28946fcbeb41;p=l2e.git

diff --git a/src/app/Application.cpp b/src/app/Application.cpp
index f773cfc..b84d724 100644
--- a/src/app/Application.cpp
+++ b/src/app/Application.cpp
@@ -85,32 +85,32 @@ void Application::PopState() {
 
 void Application::RealChangeState(State *s) {
 	if (!states.empty()) {
-		states.top()->PauseState(*this, screen.Screen());
-		states.top()->ExitState(*this, screen.Screen());
+		states.top()->OnPauseState(*this, screen.Screen());
+		states.top()->OnExitState(*this, screen.Screen());
 		states.pop();
 	}
 	states.push(s);
-	s->EnterState(*this, screen.Screen());
-	s->ResumeState(*this, screen.Screen());
+	s->OnEnterState(*this, screen.Screen());
+	s->OnResumeState(*this, screen.Screen());
 }
 
 void Application::RealPushState(State *s) {
 	if (!states.empty()) {
-		states.top()->PauseState(*this, screen.Screen());
+		states.top()->OnPauseState(*this, screen.Screen());
 	}
 	states.push(s);
-	s->EnterState(*this, screen.Screen());
-	s->ResumeState(*this, screen.Screen());
+	s->OnEnterState(*this, screen.Screen());
+	s->OnResumeState(*this, screen.Screen());
 }
 
 void Application::RealPopState() {
 	if (states.empty()) return;
-	states.top()->PauseState(*this, screen.Screen());
-	states.top()->ExitState(*this, screen.Screen());
+	states.top()->OnPauseState(*this, screen.Screen());
+	states.top()->OnExitState(*this, screen.Screen());
 	delete states.top();
 	states.pop();
 	if (!states.empty()) {
-		states.top()->ResumeState(*this, screen.Screen());
+		states.top()->OnResumeState(*this, screen.Screen());
 	}
 }
 
@@ -120,8 +120,8 @@ void Application::Quit() {
 
 void Application::PopAllStates() {
 	while (!states.empty()) {
-		states.top()->PauseState(*this, screen.Screen());
-		states.top()->ExitState(*this, screen.Screen());
+		states.top()->OnPauseState(*this, screen.Screen());
+		states.top()->OnExitState(*this, screen.Screen());
 		delete states.top();
 		states.pop();
 	}
@@ -165,7 +165,7 @@ void Application::HandleEvents() {
 				break;
 			case SDL_VIDEORESIZE:
 				screen.Resize(event.resize.w, event.resize.h);
-				CurrentState()->Resize(event.resize.w, event.resize.h);
+				CurrentState()->OnResize(event.resize.w, event.resize.h);
 				break;
 			case SDL_KEYDOWN:
 			case SDL_KEYUP: