}
void PerformAttacks::AddNumberAnimations(const TargetSelection &ts) {
- if (ts.TargetsEnemies()) {
+ if (ts.TargetsMonsters()) {
for (int i(0); i < battle->MaxMonsters(); ++i) {
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 {
void PerformAttacks::RenderTargetAnimation(SDL_Surface *screen, const geometry::Vector<int> &offset) const {
if (!targetAnimation.Valid() || !targetAnimation.Running()) return;
const TargetSelection &ts(battle->CurrentAttackAttackChoice().Selection());
- for (vector<Point<int> >::size_type i(0), end(ts.TargetsHeroes() ? battle->NumHeroes() : battle->MaxMonsters()); i < end; ++i) {
- if (ts.IsSelected(i)) {
- targetAnimation.DrawCenter(screen, (ts.TargetsHeroes() ? battle->HeroAt(i).Position() : battle->MonsterPositions()[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);
+ }
}
}
}