X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FApplication.cpp;h=f773cfcec71f96252c9da4cad9275e8096016bc9;hb=3f8fac16c7ae2cbe7da47b98aba9b558825723e7;hp=4ff75d8ed10c1104f9abf38142b4ffe46c9d3a5a;hpb=11f21c99f562231785660da3afc4d0590ad83e90;p=l2e.git

diff --git a/src/app/Application.cpp b/src/app/Application.cpp
index 4ff75d8..f773cfc 100644
--- a/src/app/Application.cpp
+++ b/src/app/Application.cpp
@@ -13,11 +13,11 @@
 
 namespace app {
 
-Application::Application(sdl::InitScreen *screen, State *initialState)
+Application::Application(sdl::InitScreen &screen, State *initialState)
 : screen(screen)
 , states()
-, last(SDL_GetTicks()) {
-	assert(screen && "cannot create application without screen");
+, last(SDL_GetTicks())
+, inStateChage(false) {
 	assert(initialState && "cannot create application without initial state");
 	RealPushState(initialState);
 }
@@ -32,6 +32,7 @@ State *Application::CurrentState() {
 }
 
 void Application::UpdateState() {
+	inStateChage = true;
 	while (!stateChanges.empty()) {
 		switch (stateChanges.front().type) {
 			case StateCommand::PUSH:
@@ -46,57 +47,70 @@ void Application::UpdateState() {
 		}
 		stateChanges.pop();
 	}
+	inStateChage = false;
 }
 
 void Application::ChangeState(State *s) {
-	StateCommand cmd;
-	cmd.type = StateCommand::CHANGE;
-	cmd.state = s;
-	stateChanges.push(cmd);
+	if (inStateChage) {
+		RealChangeState(s);
+	} else {
+		StateCommand cmd;
+		cmd.type = StateCommand::CHANGE;
+		cmd.state = s;
+		stateChanges.push(cmd);
+	}
 }
 
 void Application::PushState(State *s) {
-	StateCommand cmd;
-	cmd.type = StateCommand::PUSH;
-	cmd.state = s;
-	stateChanges.push(cmd);
+	if (inStateChage) {
+		RealPushState(s);
+	} else {
+		StateCommand cmd;
+		cmd.type = StateCommand::PUSH;
+		cmd.state = s;
+		stateChanges.push(cmd);
+	}
 }
 
 void Application::PopState() {
-	StateCommand cmd;
-	cmd.type = StateCommand::POP;
-	cmd.state = 0;
-	stateChanges.push(cmd);
+	if (inStateChage) {
+		RealPopState();
+	} else {
+		StateCommand cmd;
+		cmd.type = StateCommand::POP;
+		cmd.state = 0;
+		stateChanges.push(cmd);
+	}
 }
 
 void Application::RealChangeState(State *s) {
 	if (!states.empty()) {
-		states.top()->PauseState(*this, screen->Screen());
-		states.top()->ExitState(*this, screen->Screen());
+		states.top()->PauseState(*this, screen.Screen());
+		states.top()->ExitState(*this, screen.Screen());
 		states.pop();
 	}
 	states.push(s);
-	s->EnterState(*this, screen->Screen());
-	s->ResumeState(*this, screen->Screen());
+	s->EnterState(*this, screen.Screen());
+	s->ResumeState(*this, screen.Screen());
 }
 
 void Application::RealPushState(State *s) {
 	if (!states.empty()) {
-		states.top()->PauseState(*this, screen->Screen());
+		states.top()->PauseState(*this, screen.Screen());
 	}
 	states.push(s);
-	s->EnterState(*this, screen->Screen());
-	s->ResumeState(*this, screen->Screen());
+	s->EnterState(*this, screen.Screen());
+	s->ResumeState(*this, screen.Screen());
 }
 
 void Application::RealPopState() {
 	if (states.empty()) return;
-	states.top()->PauseState(*this, screen->Screen());
-	states.top()->ExitState(*this, screen->Screen());
+	states.top()->PauseState(*this, screen.Screen());
+	states.top()->ExitState(*this, screen.Screen());
 	delete states.top();
 	states.pop();
 	if (!states.empty()) {
-		states.top()->ResumeState(*this, screen->Screen());
+		states.top()->ResumeState(*this, screen.Screen());
 	}
 }
 
@@ -106,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()->PauseState(*this, screen.Screen());
+		states.top()->ExitState(*this, screen.Screen());
 		delete states.top();
 		states.pop();
 	}
@@ -150,7 +164,7 @@ void Application::HandleEvents() {
 				PopAllStates();
 				break;
 			case SDL_VIDEORESIZE:
-				screen->Resize(event.resize.w, event.resize.h);
+				screen.Resize(event.resize.w, event.resize.h);
 				CurrentState()->Resize(event.resize.w, event.resize.h);
 				break;
 			case SDL_KEYDOWN:
@@ -175,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();
 }
 
 }