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

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index 1b44010..03cbb21 100644
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -266,8 +266,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);