X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FApplication.cpp;h=76d98efc7fbc2609053391f7b7894693523a6c9f;hb=5d1a76ae7725af998c6ee46adfe492c68ee1d34f;hp=819882e7251f43e66b7ed77311f97c498e74d456;hpb=6d080d21d8055df9962296863b4c0954bc81410b;p=l2e.git

diff --git a/src/app/Application.cpp b/src/app/Application.cpp
index 819882e..76d98ef 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"
@@ -13,11 +6,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);
 }
@@ -28,10 +21,11 @@ Application::~Application() {
 
 
 State *Application::CurrentState() {
-	return states.top();
+	return states.empty() ? 0 : states.top();
 }
 
 void Application::UpdateState() {
+	inStateChage = true;
 	while (!stateChanges.empty()) {
 		switch (stateChanges.front().type) {
 			case StateCommand::PUSH:
@@ -46,57 +40,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(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(screen.Screen());
 }
 
 void Application::RealPushState(State *s) {
 	if (!states.empty()) {
-		states.top()->PauseState(*this, screen->Screen());
+		states.top()->PauseState(screen.Screen());
 	}
 	states.push(s);
-	s->EnterState(*this, screen->Screen());
-	s->ResumeState(*this, screen->Screen());
+	s->EnterState(*this, screen.Screen());
+	s->ResumeState(screen.Screen());
 }
 
 void Application::RealPopState() {
 	if (states.empty()) return;
-	states.top()->PauseState(*this, screen->Screen());
-	states.top()->ExitState(*this, screen->Screen());
+	states.top()->PauseState(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(screen.Screen());
 	}
 }
 
@@ -106,7 +113,10 @@ void Application::Quit() {
 
 void Application::PopAllStates() {
 	while (!states.empty()) {
-		RealPopState();
+		states.top()->PauseState(screen.Screen());
+		states.top()->ExitState(*this, screen.Screen());
+		delete states.top();
+		states.pop();
 	}
 }
 
@@ -121,7 +131,7 @@ void Application::Loop() {
 	Uint32 now(SDL_GetTicks());
 	Uint32 deltaT(now - last);
 	GlobalTimers().Update(deltaT);
-	if (deltaT > 34) deltaT = 34;
+	if (deltaT > 30) deltaT = 30;
 
 	if (CurrentState()) {
 		CurrentState()->GraphicsTimers().Update(deltaT);
@@ -147,7 +157,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:
@@ -159,21 +169,21 @@ void Application::HandleEvents() {
 				break;
 		}
 	}
-	CurrentState()->HandleEvents(input);
+	if (CurrentState()) CurrentState()->HandleEvents(input);
 }
 
 void Application::UpdateWorld(Uint32 deltaT) {
 	if (!CurrentState()) return;
-	for (Uint32 i(0); i < deltaT; ++i) {
-		CurrentState()->PhysicsTimers().Update(0.001f);
-		CurrentState()->UpdateWorld(0.001f);
+	for (Uint32 i(0); i < deltaT && !StateChangePending(); ++i) {
+		CurrentState()->PhysicsTimers().Update(1);
+		CurrentState()->UpdateWorld(1);
 	}
 }
 
 void Application::Render(void) {
 	if (!CurrentState()) return;
-	CurrentState()->Render(screen->Screen());
-	screen->Flip();
+	CurrentState()->Render(screen.Screen());
+	screen.Flip();
 }
 
 }