X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FApplication.cpp;h=0a5f5e73d4d1343c9eb770d16e09951af0c1aea2;hb=e518ac67cf94e244df16078dcbc536e6b659e758;hp=06ea7270f545ec25aebb6e4234c2587b011adac6;hpb=65158353d1ecbed0032752863c6c4eb96b1a084a;p=l2e.git

diff --git a/src/app/Application.cpp b/src/app/Application.cpp
index 06ea727..0a5f5e7 100644
--- a/src/app/Application.cpp
+++ b/src/app/Application.cpp
@@ -1,10 +1,3 @@
-/*
- * Application.cpp
- *
- *  Created on: Apr 8, 2012
- *      Author: holy
- */
-
 #include "Application.h"
 
 #include "State.h"
@@ -85,32 +78,32 @@ void Application::PopState() {
 
 void Application::RealChangeState(State *s) {
 	if (!states.empty()) {
-		states.top()->OnPauseState(*this, screen.Screen());
-		states.top()->OnExitState(*this, screen.Screen());
+		states.top()->PauseState(screen.Screen());
+		states.top()->ExitState(*this, screen.Screen());
 		states.pop();
 	}
 	states.push(s);
-	s->OnEnterState(*this, screen.Screen());
-	s->OnResumeState(*this, screen.Screen());
+	s->EnterState(*this, screen.Screen());
+	s->ResumeState(screen.Screen());
 }
 
 void Application::RealPushState(State *s) {
 	if (!states.empty()) {
-		states.top()->OnPauseState(*this, screen.Screen());
+		states.top()->PauseState(screen.Screen());
 	}
 	states.push(s);
-	s->OnEnterState(*this, screen.Screen());
-	s->OnResumeState(*this, screen.Screen());
+	s->EnterState(*this, screen.Screen());
+	s->ResumeState(screen.Screen());
 }
 
 void Application::RealPopState() {
 	if (states.empty()) return;
-	states.top()->OnPauseState(*this, screen.Screen());
-	states.top()->OnExitState(*this, screen.Screen());
+	states.top()->PauseState(screen.Screen());
+	states.top()->ExitState(*this, screen.Screen());
 	delete states.top();
 	states.pop();
 	if (!states.empty()) {
-		states.top()->OnResumeState(*this, screen.Screen());
+		states.top()->ResumeState(screen.Screen());
 	}
 }
 
@@ -120,8 +113,8 @@ void Application::Quit() {
 
 void Application::PopAllStates() {
 	while (!states.empty()) {
-		states.top()->OnPauseState(*this, screen.Screen());
-		states.top()->OnExitState(*this, screen.Screen());
+		states.top()->PauseState(screen.Screen());
+		states.top()->ExitState(*this, screen.Screen());
 		delete states.top();
 		states.pop();
 	}