fixed disabled font

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

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index 6fac152e64b87e94acc7d132b29c1e2878012de8..1b4401065e9d2c17cc1e8961c8941e1dc00d7c08 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]);
@@ -259,7 +266,12 @@ 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 (HeroAnimationAt(i).Running()) {
+                       HeroAnimationAt(i).DrawCenterBottom(screen, heroesPositions[i] + offset);
+               } else {
+                       int row(heroes[i].Health() > 0 ? 0 : 2);
+                       heroes[i].Sprite()->DrawCenterBottom(screen, heroesPositions[i] + offset, 1, row);
+               }
        }
 }