added Maxim's melee animation

[l2e.git] / src / app / Application.cpp

diff --git a/src/app/Application.cpp b/src/app/Application.cpp
index 80ebb5d1ac1c8ae51a63a508a4a763026d1b695e..6e46203aa94184de00c55d90ff41025b7433d12d 100644 (file)
--- 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() {
@@ -120,11 +120,17 @@ 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();
-       UpdateWorld(deltaT);
-       Render();
+       if (!StateChangePending()) {
+               UpdateWorld(deltaT);
+               Render();
+       }
 
        last = now;
        UpdateState();
@@ -153,12 +159,13 @@ void Application::HandleEvents() {
                                break;
                }
        }
-       CurrentState()->HandleInput(input);
+       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);
        }
 }