X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbattle%2FBattleState.cpp;h=a4e8158a4339af806392d9e0b7489a9adc3d46b4;hb=aedc31b88715246abc00a0ab333bea6e17bbb780;hp=1b4401065e9d2c17cc1e8961c8941e1dc00d7c08;hpb=e559a146d268996a3367e370213b09a3b190e0bc;p=l2e.git

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index 1b44010..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) {
 
 }
@@ -266,8 +290,10 @@ void BattleState::RenderMonsters(SDL_Surface *screen, const Vector<int> &offset)
 
 void BattleState::RenderHeroes(SDL_Surface *screen, const Vector<int> &offset) {
 	for (int i(0); i < numHeroes; ++i) {
-		if (HeroAnimationAt(i).Running()) {
-			HeroAnimationAt(i).DrawCenterBottom(screen, heroesPositions[i] + offset);
+		if (heroes[i].AttackAnimation() && heroes[i].AttackAnimation()->Running()) {
+			heroes[i].AttackAnimation()->DrawCenterBottom(screen, heroesPositions[i] + offset);
+		} else if (heroes[i].SpellAnimation() && heroes[i].SpellAnimation()->Running()) {
+			heroes[i].SpellAnimation()->DrawCenterBottom(screen, heroesPositions[i] + offset);
 		} else {
 			int row(heroes[i].Health() > 0 ? 0 : 2);
 			heroes[i].Sprite()->DrawCenterBottom(screen, heroesPositions[i] + offset, 1, row);