X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FApplication.cpp;h=64a8602e8d9b1c551bd2940224c3a1ab72746292;hb=092a2dd175a4001a495c84ee85211734fb928c83;hp=b84d7248da1a465b7eafa557cc85c0d393b6789f;hpb=2ccc2369d32fb680a3047519d79c17de34c4e10a;p=l2e.git

diff --git a/src/app/Application.cpp b/src/app/Application.cpp
index b84d724..64a8602 100644
--- a/src/app/Application.cpp
+++ b/src/app/Application.cpp
@@ -1,13 +1,7 @@
-/*
- * Application.cpp
- *
- *  Created on: Apr 8, 2012
- *      Author: holy
- */
-
 #include "Application.h"
 
 #include "State.h"
+#include "../sdl/InitScreen.h"
 
 #include <cassert>
 
@@ -85,32 +79,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 +114,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();
 	}
@@ -165,7 +159,7 @@ void Application::HandleEvents() {
 				break;
 			case SDL_VIDEORESIZE:
 				screen.Resize(event.resize.w, event.resize.h);
-				CurrentState()->OnResize(event.resize.w, event.resize.h);
+				CurrentState()->Resize(event.resize.w, event.resize.h);
 				break;
 			case SDL_KEYDOWN:
 			case SDL_KEYUP:
@@ -182,8 +176,8 @@ void Application::HandleEvents() {
 void Application::UpdateWorld(Uint32 deltaT) {
 	if (!CurrentState()) return;
 	for (Uint32 i(0); i < deltaT && !StateChangePending(); ++i) {
-		CurrentState()->PhysicsTimers().Update(0.001f);
-		CurrentState()->UpdateWorld(0.001f);
+		CurrentState()->PhysicsTimers().Update(1);
+		CurrentState()->UpdateWorld(1);
 	}
 }