X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmenu%2FPartyMenu.h;h=a009c339c4a0acc25c4f5f491b2320eecc955c4a;hb=a3ba4dc677ad7c92eeb78b20b642241563605c9d;hp=d7edf31f3c335a4ecf300a6d7535890a79731fad;hpb=243cb7d922fe888be8d18241de138ad5949de430;p=l2e.git

diff --git a/src/menu/PartyMenu.h b/src/menu/PartyMenu.h
index d7edf31..a009c33 100644
--- a/src/menu/PartyMenu.h
+++ b/src/menu/PartyMenu.h
@@ -1,10 +1,3 @@
-/*
- * PartyMenu.h
- *
- *  Created on: Oct 21, 2012
- *      Author: holy
- */
-
 #ifndef MENU_PARTYMENU_H_
 #define MENU_PARTYMENU_H_
 
@@ -12,7 +5,7 @@
 #include "HeroStatus.h"
 #include "../app/State.h"
 #include "../common/fwd.h"
-#include "../geometry/Vector.h"
+#include "../math/Vector.h"
 #include "../graphics/Menu.h"
 
 namespace menu {
@@ -40,14 +33,16 @@ public:
 
 public:
 	void RenderBackground(SDL_Surface *screen) const;
-	void RenderHeros(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
-	void RenderMenu(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
-	void RenderInfo(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
+	void RenderHeros(SDL_Surface *screen, const math::Vector<int> &offset) const;
+	void RenderMenu(SDL_Surface *screen, const math::Vector<int> &offset) const;
+	void RenderInfo(SDL_Surface *screen, const math::Vector<int> &offset) const;
 
-	geometry::Vector<int> StatusOffset(int index) const;
+	math::Vector<int> StatusOffset(int index) const;
 	const HeroStatus &GetHeroStatus(int index) const { return status[index]; }
 
-	static void OnStatusSelect(PartyMenu *, int);
+	static void OnEquipSelect(void *, int);
+	static void OnSpellSelect(void *, int);
+	static void OnStatusSelect(void *, int);
 
 private:
 	virtual void OnEnterState(SDL_Surface *screen);
@@ -71,7 +66,7 @@ private:
 
 private:
 	HeroStatus status[4];
-	geometry::Vector<int> statusPositions[4];
+	math::Vector<int> statusPositions[4];
 	common::GameConfig *game;
 	graphics::Menu<int> mainMenu;