X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FApplication.cpp;h=4c8c5747ff71dd5620fe2a6d26c96fdf0efc4e03;hb=aa1a197e532673f0c4d33dee5bed27298c050d38;hp=29eaee781e9ba20780fafa2cc4bde331777d059a;hpb=25d7499f7923291d7287123320e7563a367e92e7;p=l2e.git

diff --git a/src/app/Application.cpp b/src/app/Application.cpp
index 29eaee7..4c8c574 100644
--- a/src/app/Application.cpp
+++ b/src/app/Application.cpp
@@ -28,7 +28,7 @@ Application::~Application() {
 
 
 State *Application::CurrentState() {
-	return states.top();
+	return states.empty() ? 0 : states.top();
 }
 
 void Application::UpdateState() {
@@ -106,7 +106,10 @@ void Application::Quit() {
 
 void Application::PopAllStates() {
 	while (!states.empty()) {
-		RealPopState();
+		states.top()->PauseState(*this, screen->Screen());
+		states.top()->ExitState(*this, screen->Screen());
+		delete states.top();
+		states.pop();
 	}
 }
 
@@ -120,8 +123,12 @@ void Application::Run() {
 void Application::Loop() {
 	Uint32 now(SDL_GetTicks());
 	Uint32 deltaT(now - last);
-	if (deltaT > 34) deltaT = 34;
+	GlobalTimers().Update(deltaT);
+	if (deltaT > 30) deltaT = 30;
 
+	if (CurrentState()) {
+		CurrentState()->GraphicsTimers().Update(deltaT);
+	}
 	HandleEvents();
 	if (!StateChangePending()) {
 		UpdateWorld(deltaT);
@@ -155,12 +162,13 @@ void Application::HandleEvents() {
 				break;
 		}
 	}
-	CurrentState()->HandleInput(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);
 	}
 }