X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FRunState.cpp;h=311e0f35c3cc8b8c7aba89350901da1c762a3e92;hb=5ca18f73987fb3935ab34654cbbecf5eca4704cb;hp=a22f43816a0006612066ba5ad290df8fd070548d;hpb=0542849dfccfec1ce1477265fa0fee2401a8fb23;p=l2e.git

diff --git a/src/battle/states/RunState.cpp b/src/battle/states/RunState.cpp
index a22f438..311e0f3 100644
--- a/src/battle/states/RunState.cpp
+++ b/src/battle/states/RunState.cpp
@@ -22,25 +22,24 @@ using geometry::Vector;
 
 namespace battle {
 
-void RunState::EnterState(Application &c, SDL_Surface *screen) {
-	ctrl = &c;
-	// TODO: push battle animation if enemy is faster
+void RunState::OnEnterState(SDL_Surface *screen) {
+
 }
 
-void RunState::ExitState(Application &c, SDL_Surface *screen) {
-	ctrl = 0;
+void RunState::OnExitState(SDL_Surface *screen) {
+
 }
 
-void RunState::ResumeState(Application &ctrl, SDL_Surface *screen) {
+void RunState::OnResumeState(SDL_Surface *screen) {
 	timer = GraphicsTimers().StartCountdown(2500);
 }
 
-void RunState::PauseState(Application &ctrl, SDL_Surface *screen) {
+void RunState::OnPauseState(SDL_Surface *screen) {
 
 }
 
 
-void RunState::Resize(int width, int height) {
+void RunState::OnResize(int width, int height) {
 
 }
 
@@ -48,7 +47,7 @@ void RunState::Resize(int width, int height) {
 void RunState::HandleEvents(const Input &input) {
 	if (timer.Finished()) {
 		battle->SetRunaway();
-		ctrl->PopState(); // pop self
+		Ctrl().PopState(); // pop self
 	}
 }
 
@@ -68,7 +67,7 @@ void RunState::Render(SDL_Surface *screen) {
 
 void RunState::RenderTitleBar(SDL_Surface *screen, const Vector<int> &offset) {
 	int height(battle->Res().titleFrame->BorderHeight() * 2 + battle->Res().titleFont->CharHeight());
-	battle->Res().titleFrame->Draw(screen, Vector<int>(offset.X(), offset.Y()), battle->Width(), height);
+	battle->Res().titleFrame->Draw(screen, offset, battle->Width(), height);
 
 	Vector<int> textPosition(
 			(battle->Width() - (std::strlen(battle->Res().escapeText) * battle->Res().titleFont->CharWidth())) / 2,