X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FState.h;h=58538faf99c70f33dd6b16c5b66dfb6a63cb3845;hb=092a2dd175a4001a495c84ee85211734fb928c83;hp=a84afde9941a26b0809cdd20c884f9e6ab0920be;hpb=7252571fb926a187c4c40e8f4eec718f16d63ffa;p=l2e.git

diff --git a/src/app/State.h b/src/app/State.h
index a84afde..58538fa 100644
--- a/src/app/State.h
+++ b/src/app/State.h
@@ -1,14 +1,11 @@
-/*
- * State.h
- *
- *  Created on: Apr 8, 2012
- *      Author: holy
- */
-
 #ifndef APP_APPLICATIONSTATE_H_
 #define APP_APPLICATIONSTATE_H_
 
-#include "fwd.h"
+namespace app {
+	class Application;
+	class Input;
+}
+
 #include "Timer.h"
 
 #include <SDL.h>
@@ -19,6 +16,7 @@ namespace app {
 class State {
 
 public:
+	State();
 	virtual ~State();
 
 public:
@@ -27,9 +25,9 @@ public:
 	/// Called by Application when popping this state.
 	void ExitState(Application &ctrl, SDL_Surface *screen);
 	/// Called by Application when this state becomes the top state.
-	void ResumeState(Application &ctrl, SDL_Surface *screen);
+	void ResumeState(SDL_Surface *screen);
 	/// Called by Application when this state no longer is the top state.
-	void PauseState(Application &ctrl, SDL_Surface *screen);
+	void PauseState(SDL_Surface *screen);
 
 	/// Called by Application on SDL window resize events.
 	void Resize(int width, int height);
@@ -37,23 +35,30 @@ public:
 	/// Handle interactive events such as input and timers.
 	virtual void HandleEvents(const Input &) = 0;
 	/// Update the time-dependant world representation.
-	virtual void UpdateWorld(float deltaT) = 0;
+	virtual void UpdateWorld(Uint32 deltaMs) = 0;
 	/// Draw a picture of the world.
 	virtual void Render(SDL_Surface *) = 0;
 
+protected:
+	/// Get a handle to the application this state is running on.
+	/// Do not call this while the state is off the stack (e.g. in c'tor/d'tor)
+	/// or you'll get a std::domain_error (potentially evil in d'tor)!
+	Application &Ctrl();
+	const Application &Ctrl() const;
+
 private:
 	/// Do some setup that needs an application and/or screen handle and thus
 	/// can not be done by the constructor.
 	/// Called when the state first enters the stack.
 	/// @param ctrl the Application running the state
-	virtual void OnEnterState(Application &ctrl, SDL_Surface *screen) = 0;
+	virtual void OnEnterState(SDL_Surface *screen) = 0;
 	/// Do some cleanup.
 	/// Called when the state is popped from the stack.
-	virtual void OnExitState(Application &ctrl, SDL_Surface *screen) = 0;
+	virtual void OnExitState(SDL_Surface *screen) = 0;
 	/// Called when the state becomes the active one.
-	virtual void OnResumeState(Application &ctrl, SDL_Surface *screen) = 0;
+	virtual void OnResumeState(SDL_Surface *screen) = 0;
 	/// Called when the state becomes inactive.
-	virtual void OnPauseState(Application &ctrl, SDL_Surface *screen) = 0;
+	virtual void OnPauseState(SDL_Surface *screen) = 0;
 
 	/// Adapt the state's graphics to given dimensions.
 	/// NOTE: currently, this is only called for the stack top and not
@@ -69,11 +74,12 @@ public:
 	/// Timers handle intended for graphics, sync'ed with world time.
 	/// These timers are only updated for the stack top and thus appear paused
 	/// when the state is visible (roughly).
-	Timers<float> &PhysicsTimers() { return physicsTimers; }
+	Timers<Uint32> &PhysicsTimers() { return physicsTimers; }
 
 private:
+	Application *ctrl;
 	Timers<Uint32> graphicsTimers;
-	Timers<float> physicsTimers;
+	Timers<Uint32> physicsTimers;
 
 };