reworked PerformAttacks

[l2e.git] / src / battle / BattleState.cpp

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index 6fac152e64b87e94acc7d132b29c1e2878012de8..a4e8158a4339af806392d9e0b7489a9adc3d46b4 100644 (file)
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -51,6 +51,13 @@ void BattleState::AddHero(const Hero &h) {
        ++numHeroes;
 }
 
+void BattleState::NextHero() {
+       ++activeHero;
+       while (activeHero < numHeroes && heroes[activeHero].Health() == 0) {
+               ++activeHero;
+       }
+}
+
 void BattleState::SwapHeroes(int lhs, int rhs) {
        if (lhs < 0 || lhs >= numHeroes || rhs < 0 || rhs >= numHeroes || lhs == rhs) return;
        std::swap(heroes[lhs], heroes[rhs]);
@@ -226,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) {
 
 }
@@ -259,7 +290,14 @@ 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) {
-               heroes[i].Sprite()->DrawCenterBottom(screen, heroesPositions[i] + offset, 0, 1);
+               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);
+               }
        }
 }