removed pasting fail from ikari selection

[l2e.git] / src / battle / PartyLayout.h

diff --git a/src/battle/PartyLayout.h b/src/battle/PartyLayout.h
index 1456f15ae89f7cc435ac3ed03df950b41988ad8a..1d72aa8ad483bc8fadeafc6cf62a16d41fea5971 100644 (file)
--- 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>
 
@@ -21,26 +22,34 @@ public:
        PartyLayout() { }
 
 public:
-       int NumPositions() const { return positions.size(); }
+       std::vector<geometry::Vector<Uint8> >::size_type NumPositions() const { return positions.size(); }
        template<class U>
-       void CalculatePositions(U width, U height, std::vector<geometry::Point<U> > &dest) const {
+       void CalculatePositions(U width, U height, std::vector<geometry::Vector<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() * 256 / width,
-                                       i->Y() * 256 / height
+               for (std::vector<geometry::Vector<Uint8> >::const_iterator i(positions.begin()), end(positions.end()); i != end; ++i) {
+                       dest.push_back(geometry::Vector<U>(
+                                       i->X() * width / 255,
+                                       i->Y() * height / 223
                                        ));
                }
        }
+       template<class U>
+       geometry::Vector<U> CalculatePosition(std::vector<geometry::Vector<Uint8> >::size_type index, U width, U height) const {
+               assert(index >= 0 && index < positions.size());
+               return geometry::Vector<U>(
+                               positions[index].X() * width / 255,
+                               positions[index].Y() * height / 223
+                               );
+       }
 
 public:
-       void AddPosition(const geometry::Point<Uint8> &p) {
+       void AddPosition(const geometry::Vector<Uint8> &p) {
                positions.push_back(p);
        }
 
 private:
-       std::vector<geometry::Point<Uint8> > positions;
+       std::vector<geometry::Vector<Uint8> > positions;
 
 };