X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.cpp;h=a4e8158a4339af806392d9e0b7489a9adc3d46b4;hb=85ac93ffe31bfeee54aa6167111f1c15f14bc405;hp=03cbb213623b26bf9cd0383dcfd2a26f7c95b9ad;hpb=854e5229c3f30bf88aa08d7f0aff56a1411c3367;p=l2e.git

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index 03cbb21..a4e8158 100644
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -233,6 +233,30 @@ void BattleState::ClearAllAttacks() {
 }
 
 
+class OrderCompare {
+	public:
+		OrderCompare(BattleState *battle) : battle(battle) { }
+		bool operator ()(const BattleState::Order &lhs, const BattleState::Order &rhs) {
+			int lagl(lhs.isMonster ? battle->MonsterAt(lhs.index).Agility() : battle->HeroAt(lhs.index).Agility());
+			int ragl(rhs.isMonster ? battle->MonsterAt(rhs.index).Agility() : battle->HeroAt(rhs.index).Agility());
+			return lagl > ragl;
+		}
+	private:
+		BattleState *battle;
+};
+
+void BattleState::WriteOrder(std::vector<Order> &order) {
+	order.reserve(monsters.size() + NumHeroes());
+	for (int i(0); i < numHeroes; ++i) {
+		order.push_back(Order(i, false));
+	}
+	for (vector<Monster>::size_type i(0), end(monsters.size()); i < end; ++i) {
+		order.push_back(Order(i, true));
+	}
+	std::sort(order.begin(), order.end(), OrderCompare(this));
+}
+
+
 void BattleState::HandleEvents(const Input &input) {
 
 }