X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FPartyLayout.h;h=e4f7d1b706517393bd262bebdeeaa26cd069f7d3;hb=b02da898c7c8a08141df4e797774a61cf5e0163f;hp=d16f2bdd6eb678212b60e1c098cdbdc3b2777f87;hpb=d1df71f636f14fe2cb5b44b173e3d30bdc73521e;p=l2e.git

diff --git a/src/battle/PartyLayout.h b/src/battle/PartyLayout.h
index d16f2bd..e4f7d1b 100644
--- a/src/battle/PartyLayout.h
+++ b/src/battle/PartyLayout.h
@@ -8,8 +8,9 @@
 #ifndef BATTLE_PARTYLAYOUT_H_
 #define BATTLE_PARTYLAYOUT_H_
 
-#include "../geometry/Point.h"
+#include "../geometry/Vector.h"
 
+#include <cassert>
 #include <vector>
 #include <SDL.h>
 
@@ -18,29 +19,25 @@ namespace battle {
 class PartyLayout {
 
 public:
-	PartyLayout() { }
+	PartyLayout() : positions(0), numPositions(0) { }
 
 public:
-	std::vector<geometry::Point<Uint8> >::size_type NumPositions() const { return positions.size(); }
-	template<class U>
-	void CalculatePositions(U width, U height, std::vector<geometry::Point<U> > &dest) const {
-		dest.clear();
-		dest.reserve(positions.size());
-		for (std::vector<geometry::Point<Uint8> >::const_iterator i(positions.begin()), end(positions.end()); i != end; ++i) {
-			dest.push_back(geometry::Point<U>(
-					i->X() * width / 255,
-					i->Y() * height / 223
-					));
-		}
-	}
+	std::vector<geometry::Vector<int> >::size_type NumPositions() const { return numPositions; }
+	void CalculatePositions(int width, int height, std::vector<geometry::Vector<int> > &dest) const;
+	geometry::Vector<int> CalculatePosition(int index, int width, int height) const;
 
 public:
-	void AddPosition(const geometry::Point<Uint8> &p) {
-		positions.push_back(p);
+	void SetPositions(const geometry::Vector<int> *p, int num) {
+		positions = p;
+		numPositions = num;
 	}
 
+	static void CreateTypeDescription();
+	static void Construct(void *);
+
 private:
-	std::vector<geometry::Point<Uint8> > positions;
+	const geometry::Vector<int> *positions;
+	int numPositions;
 
 };