X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmenu%2FCapsuleMenu.h;h=0ddb2e874a8e4e65ca2758f0137e30e8c0ee1111;hb=5d1a76ae7725af998c6ee46adfe492c68ee1d34f;hp=ce57bd280534bfbc9ff7720b71ca1f3c46a3d020;hpb=7f0a586b8238c7093a8942ff5b5c4122edd386fc;p=l2e.git

diff --git a/src/menu/CapsuleMenu.h b/src/menu/CapsuleMenu.h
index ce57bd2..0ddb2e8 100644
--- a/src/menu/CapsuleMenu.h
+++ b/src/menu/CapsuleMenu.h
@@ -4,7 +4,7 @@
 #include "fwd.h"
 #include "../app/State.h"
 #include "../common/fwd.h"
-#include "../geometry/Vector.h"
+#include "../math/Vector.h"
 #include "../graphics/Menu.h"
 
 namespace menu {
@@ -17,10 +17,25 @@ 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 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;
 	int Height() const;
 
@@ -32,19 +47,14 @@ private:
 
 	virtual void OnResize(int width, int height);
 
-	const common::Capsule &GetCapsule() const;
-
-	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;
-
 private:
 	PartyMenu *parent;
-	graphics::Menu<int> menu;
+	enum Choice {
+		CHOICE_FEED,
+		CHOICE_CHANGE,
+		CHOICE_NAME,
+	};
+	graphics::Menu<Choice> menu;
 
 };