X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FApplication.cpp;h=6e46203aa94184de00c55d90ff41025b7433d12d;hb=8456b7dac2051bfd2b507a39854c1428eb4d91cd;hp=819882e7251f43e66b7ed77311f97c498e74d456;hpb=6d080d21d8055df9962296863b4c0954bc81410b;p=l2e.git diff --git a/src/app/Application.cpp b/src/app/Application.cpp index 819882e..6e46203 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() { @@ -121,7 +121,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);