X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FRunState.cpp;h=956fa133ec1317329a41bce85e23f1d4d448187e;hb=5d1a76ae7725af998c6ee46adfe492c68ee1d34f;hp=56bcbedc7c7db2c7c02dabae00eb2cda0216aec7;hpb=65158353d1ecbed0032752863c6c4eb96b1a084a;p=l2e.git

diff --git a/src/battle/states/RunState.cpp b/src/battle/states/RunState.cpp
index 56bcbed..956fa13 100644
--- a/src/battle/states/RunState.cpp
+++ b/src/battle/states/RunState.cpp
@@ -10,7 +10,7 @@
 #include "../BattleState.h"
 #include "../../app/Application.h"
 #include "../../app/Input.h"
-#include "../../geometry/Vector.h"
+#include "../../math/Vector.h"
 #include "../../graphics/Font.h"
 #include "../../graphics/Frame.h"
 
@@ -18,28 +18,28 @@
 
 using app::Application;
 using app::Input;
-using geometry::Vector;
+using math::Vector;
 
 namespace battle {
 
-void RunState::OnEnterState(Application &c, SDL_Surface *screen) {
-	ctrl = &c;
+void RunState::OnEnterState(SDL_Surface *screen) {
+
 }
 
-void RunState::OnExitState(Application &c, SDL_Surface *screen) {
-	ctrl = 0;
+void RunState::OnExitState(SDL_Surface *screen) {
+
 }
 
-void RunState::OnResumeState(Application &ctrl, SDL_Surface *screen) {
+void RunState::OnResumeState(SDL_Surface *screen) {
 	timer = GraphicsTimers().StartCountdown(2500);
 }
 
-void RunState::OnPauseState(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) {
 
 }
 
@@ -47,12 +47,12 @@ 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
 	}
 }
 
 
-void RunState::UpdateWorld(float deltaT) {
+void RunState::UpdateWorld(Uint32 deltaT) {
 
 }