X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FApplication.cpp;h=0a5f5e73d4d1343c9eb770d16e09951af0c1aea2;hb=e518ac67cf94e244df16078dcbc536e6b659e758;hp=f773cfcec71f96252c9da4cad9275e8096016bc9;hpb=7252571fb926a187c4c40e8f4eec718f16d63ffa;p=l2e.git diff --git a/src/app/Application.cpp b/src/app/Application.cpp index f773cfc..0a5f5e7 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" @@ -85,32 +78,32 @@ void Application::PopState() { void Application::RealChangeState(State *s) { if (!states.empty()) { - states.top()->PauseState(*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->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->ResumeState(screen.Screen()); } void Application::RealPopState() { if (states.empty()) return; - states.top()->PauseState(*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()); } } @@ -120,7 +113,7 @@ void Application::Quit() { void Application::PopAllStates() { while (!states.empty()) { - states.top()->PauseState(*this, screen.Screen()); + states.top()->PauseState(screen.Screen()); states.top()->ExitState(*this, screen.Screen()); delete states.top(); states.pop();