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

diff --git a/src/app/Application.cpp b/src/app/Application.cpp
index 4de48d4..b84d724 100644
--- a/src/app/Application.cpp
+++ b/src/app/Application.cpp
@@ -13,12 +13,11 @@
 
 namespace app {
 
-Application::Application(sdl::InitScreen *screen, State *initialState)
+Application::Application(sdl::InitScreen &screen, State *initialState)
 : screen(screen)
 , states()
 , last(SDL_GetTicks())
 , inStateChage(false) {
-	assert(screen && "cannot create application without screen");
 	assert(initialState && "cannot create application without initial state");
 	RealPushState(initialState);
 }
@@ -86,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());
 	}
 }
 
@@ -121,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,8 +164,8 @@ void Application::HandleEvents() {
 				PopAllStates();
 				break;
 			case SDL_VIDEORESIZE:
-				screen->Resize(event.resize.w, event.resize.h);
-				CurrentState()->Resize(event.resize.w, event.resize.h);
+				screen.Resize(event.resize.w, event.resize.h);
+				CurrentState()->OnResize(event.resize.w, event.resize.h);
 				break;
 			case SDL_KEYDOWN:
 			case SDL_KEYUP:
@@ -190,8 +189,8 @@ void Application::UpdateWorld(Uint32 deltaT) {
 
 void Application::Render(void) {
 	if (!CurrentState()) return;
-	CurrentState()->Render(screen->Screen());
-	screen->Flip();
+	CurrentState()->Render(screen.Screen());
+	screen.Flip();
 }
 
 }