X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmenu%2FCapsuleMenu.h;h=c42eb4952c3d631e1c8080d21c872315825432af;hb=092a2dd175a4001a495c84ee85211734fb928c83;hp=1491f391d294b5e70cbdf479d6d4b3aff7a1f41f;hpb=60e0fe29ce6cd033edc78b181d9d07fa72c11172;p=l2e.git

diff --git a/src/menu/CapsuleMenu.h b/src/menu/CapsuleMenu.h
index 1491f39..c42eb49 100644
--- a/src/menu/CapsuleMenu.h
+++ b/src/menu/CapsuleMenu.h
@@ -1,10 +1,20 @@
 #ifndef MENU_CAPSULEMENU_H_
 #define MENU_CAPSULEMENU_H_
 
-#include "fwd.h"
+namespace common {
+	class Capsule;
+	struct GameConfig;
+}
+namespace math {
+	template<class>
+	class Vector;
+}
+namespace menu {
+	class PartyMenu;
+	struct Resources;
+}
+
 #include "../app/State.h"
-#include "../common/fwd.h"
-#include "../geometry/Vector.h"
 #include "../graphics/Menu.h"
 
 namespace menu {
@@ -17,22 +27,23 @@ public:
 
 public:
 	virtual void HandleEvents(const app::Input &);
-	virtual void UpdateWorld(float deltaT);
+	virtual void UpdateWorld(Uint32 deltaT);
 	virtual void Render(SDL_Surface *);
 
 	void RenderBackground(SDL_Surface *screen) const;
-	void RenderCapsule(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
-	void RenderInfo(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
-	void RenderWheel(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
-	void RenderStats(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
-	void RenderStatsLine(SDL_Surface *screen, const geometry::Vector<int> &offset, const char *name, int value) const;
-	void RenderMenu(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
+	void RenderCapsule(SDL_Surface *screen, const math::Vector<int> &offset) const;
+	void RenderInfo(SDL_Surface *screen, const math::Vector<int> &offset) const;
+	void RenderWheel(SDL_Surface *screen, const math::Vector<int> &offset) const;
+	void RenderStats(SDL_Surface *screen, const math::Vector<int> &offset) const;
+	void RenderStatsLine(SDL_Surface *screen, const math::Vector<int> &offset, const char *name, int value) const;
+	void RenderMenu(SDL_Surface *screen, const math::Vector<int> &offset) const;
 
 public:
 	common::GameConfig &Game();
 	const common::GameConfig &Game() const;
 	Resources &Res();
 	const Resources &Res() const;
+	common::Capsule &GetCapsule();
 	const common::Capsule &GetCapsule() const;
 
 	int Width() const;