targetAnimation = AnimationRunner(monster.MeleeAnimation());
moveAnimation = AnimationRunner(monster.AttackAnimation());
monster.SetAnimation(moveAnimation);
- AddNumberAnimations(battle->MonsterAttackChoiceAt(battle->CurrentAttack().index).Selection());
+ AddNumberAnimations(battle->MonsterAt(battle->CurrentAttack().index).GetAttackChoice().Selection());
} else {
Hero &hero(battle->HeroAt(battle->CurrentAttack().index));
- const AttackChoice &ac(battle->AttackChoiceAt(battle->CurrentAttack().index));
+ const AttackChoice &ac(battle->HeroAt(battle->CurrentAttack().index).GetAttackChoice());
switch (ac.GetType()) {
case AttackChoice::SWORD:
moveAnimation.Clear();
break;
}
- hero.SetAnimation(moveAnimation);
}
if (titleBarText) titleBarTimer = GraphicsTimers().StartCountdown(850);
- if (moveAnimation.Valid()) moveAnimation.Start(*this);
+ if (moveAnimation.Valid()) {
+ moveAnimation.Start(*this);
+ if (battle->CurrentAttack().isMonster) {
+ battle->MonsterAt(battle->CurrentAttack().index).SetAnimation(moveAnimation);
+ } else {
+ battle->HeroAt(battle->CurrentAttack().index).SetAnimation(moveAnimation);
+ }
+ }
if (targetAnimation.Valid()) {
targetAnimationTimer = GraphicsTimers().StartCountdown(150);
} else {
if (ts.IsBad(i)) {
numberAnimation.push_back(NumberAnimation(ts.GetAmount(i), battle->Res().numberAnimationPrototype, battle->Res().bigNumberSprite));
numberPosition.push_back(
- battle->MonsterPositions()[i]);
+ battle->MonsterAt(i).Position());
} else if (ts.IsGood(i)) {
numberAnimation.push_back(NumberAnimation(ts.GetAmount(i), battle->Res().numberAnimationPrototype, battle->Res().greenNumberSprite));
numberPosition.push_back(
- battle->MonsterPositions()[i]);
+ battle->MonsterAt(i).Position());
}
}
} else {
if (ts.IsBad(i)) {
numberAnimation.push_back(NumberAnimation(ts.GetAmount(i), battle->Res().numberAnimationPrototype, battle->Res().bigNumberSprite));
numberPosition.push_back(
- battle->HeroesPositions()[i]);
+ battle->HeroAt(i).Position());
} else if (ts.IsGood(i)) {
numberAnimation.push_back(NumberAnimation(ts.GetAmount(i), battle->Res().numberAnimationPrototype, battle->Res().greenNumberSprite));
numberPosition.push_back(
- battle->HeroesPositions()[i]);
+ battle->HeroAt(i).Position());
}
}
}
void PerformAttacks::RenderTargetAnimation(SDL_Surface *screen, const geometry::Vector<int> &offset) const {
if (!targetAnimation.Valid() || !targetAnimation.Running()) return;
const TargetSelection &ts(battle->CurrentAttackAttackChoice().Selection());
- const vector<Point<int> > &positions(ts.TargetsHeroes() ? battle->HeroesPositions() : battle->MonsterPositions());
- for (vector<Point<int> >::size_type i(0), end(positions.size()); i < end; ++i) {
- if (ts.IsSelected(i)) {
- targetAnimation.DrawCenter(screen, positions[i] + offset);
+ if (ts.TargetsHeroes()) {
+ for (vector<Point<int> >::size_type i(0), end(battle->NumHeroes()); i < end; ++i) {
+ if (ts.IsSelected(i)) {
+ targetAnimation.DrawCenter(screen, battle->HeroAt(i).Position() + offset);
+ }
+ }
+ } else {
+ for (vector<Point<int> >::size_type i(0), end(battle->MaxMonsters()); i < end; ++i) {
+ if (ts.IsSelected(i)) {
+ targetAnimation.DrawCenter(screen, battle->MonsterAt(i).Position() + offset);
+ }
}
}
}