extracted battle logic into a class

[l2e.git] / src / battle / states / PerformAttacks.cpp

diff --git a/src/battle/states/PerformAttacks.cpp b/src/battle/states/PerformAttacks.cpp
index 92e5185cf70488a5ce8baf9a330011ef7ba51934..2274cfc10a390a15f3dca0f9f4c3fca936528b85 100644 (file)
--- a/src/battle/states/PerformAttacks.cpp
+++ b/src/battle/states/PerformAttacks.cpp
@@ -23,9 +23,22 @@ using std::vector;
 
 namespace battle {
 
+PerformAttacks::PerformAttacks(Battle *battle, BattleState *parent)
+: battle(battle)
+, parent(parent)
+, moveAnimation(0)
+, targetAnimation(0)
+, titleBarText(0)
+, cursor(-1) {
+
+}
+
+
 void PerformAttacks::OnEnterState(SDL_Surface *screen) {
        battle->CalculateAttackOrder();
-       numberAnimation.reserve(battle->MaxMonsters() > battle->NumHeroes() + 1 ? battle->MaxMonsters() : battle->NumHeroes() + 1);
+       numberAnimation.reserve(battle->MaxMonsters() > battle->NumHeroes() + 1
+                       ? battle->MaxMonsters()
+                       : battle->NumHeroes() + 1);
        numberPosition.reserve(numberAnimation.size());
        OnResize(screen->w, screen->h);
 }
@@ -44,10 +57,10 @@ void PerformAttacks::OnPauseState(SDL_Surface *screen) {
 
 
 void PerformAttacks::OnResize(int width, int height) {
-       const Resources &res = battle->Res();
-       framePosition = battle->ScreenOffset();
+       const Resources &res = parent->Res();
+       framePosition = parent->ScreenOffset();
        frameSize = Vector<int>(
-                       battle->Width(),
+                       parent->Width(),
                        res.titleFrame->BorderHeight() * 2 + res.titleFont->CharHeight());
 }
 
@@ -81,7 +94,7 @@ void PerformAttacks::HandleEvents(const Input &input) {
                AddNumberAnimations(capsule.GetAttackChoice().Selection());
        } else {
                Hero &hero(battle->HeroAt(battle->CurrentAttack().index));
-               const AttackChoice &ac(battle->HeroAt(battle->CurrentAttack().index).GetAttackChoice());
+               const AttackChoice &ac(battle->CurrentAttackAttackChoice());
 
                switch (ac.GetType()) {
                        case AttackChoice::SWORD:
@@ -126,9 +139,9 @@ void PerformAttacks::HandleEvents(const Input &input) {
 
        if (titleBarText) {
                titleBarTimer = GraphicsTimers().StartCountdown(850);
-               textPosition = battle->ScreenOffset() + Vector<int>(
-                               (battle->Width() - std::strlen(titleBarText) * battle->Res().titleFont->CharWidth()) / 2,
-                               battle->Res().titleFrame->BorderHeight());
+               textPosition = parent->ScreenOffset() + Vector<int>(
+                               (parent->Width() - std::strlen(titleBarText) * parent->Res().titleFont->CharWidth()) / 2,
+                               parent->Res().titleFrame->BorderHeight());
        }
        if (moveAnimation.Valid()) {
                moveAnimation.Start(*this);
@@ -151,25 +164,25 @@ void PerformAttacks::AddNumberAnimations(const TargetSelection &ts) {
        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));
+                               numberAnimation.push_back(NumberAnimation(ts.GetAmount(i), parent->Res().numberAnimationPrototype, parent->Res().bigNumberSprite));
                                numberPosition.push_back(
-                                               battle->MonsterAt(i).Position() + battle->ScreenOffset());
+                                               battle->MonsterAt(i).Position() + parent->ScreenOffset());
                        } else if (ts.IsGood(i)) {
-                               numberAnimation.push_back(NumberAnimation(ts.GetAmount(i), battle->Res().numberAnimationPrototype, battle->Res().greenNumberSprite));
+                               numberAnimation.push_back(NumberAnimation(ts.GetAmount(i), parent->Res().numberAnimationPrototype, parent->Res().greenNumberSprite));
                                numberPosition.push_back(
-                                               battle->MonsterAt(i).Position() + battle->ScreenOffset());
+                                               battle->MonsterAt(i).Position() + parent->ScreenOffset());
                        }
                }
        } else {
                for (int i(0); i < battle->NumHeroes(); ++i) {
                        if (ts.IsBad(i)) {
-                               numberAnimation.push_back(NumberAnimation(ts.GetAmount(i), battle->Res().numberAnimationPrototype, battle->Res().bigNumberSprite));
+                               numberAnimation.push_back(NumberAnimation(ts.GetAmount(i), parent->Res().numberAnimationPrototype, parent->Res().bigNumberSprite));
                                numberPosition.push_back(
-                                               battle->HeroAt(i).Position() + battle->ScreenOffset());
+                                               battle->HeroAt(i).Position() + parent->ScreenOffset());
                        } else if (ts.IsGood(i)) {
-                               numberAnimation.push_back(NumberAnimation(ts.GetAmount(i), battle->Res().numberAnimationPrototype, battle->Res().greenNumberSprite));
+                               numberAnimation.push_back(NumberAnimation(ts.GetAmount(i), parent->Res().numberAnimationPrototype, parent->Res().greenNumberSprite));
                                numberPosition.push_back(
-                                               battle->HeroAt(i).Position() + battle->ScreenOffset());
+                                               battle->HeroAt(i).Position() + parent->ScreenOffset());
                        }
                }
        }
@@ -225,11 +238,11 @@ void PerformAttacks::UpdateWorld(Uint32 deltaT) {
 }
 
 void PerformAttacks::Render(SDL_Surface *screen) {
-       battle->RenderBackground(screen);
-       battle->RenderMonsters(screen);
-       battle->RenderHeroes(screen);
-       battle->RenderCapsule(screen);
-       battle->RenderSmallHeroTags(screen);
+       parent->RenderBackground(screen);
+       parent->RenderMonsters(screen);
+       parent->RenderHeroes(screen);
+       parent->RenderCapsule(screen);
+       parent->RenderSmallHeroTags(screen);
        RenderTitleBar(screen);
        RenderNumbers(screen);
        RenderTargetAnimation(screen);
@@ -238,9 +251,9 @@ void PerformAttacks::Render(SDL_Surface *screen) {
 void PerformAttacks::RenderTitleBar(SDL_Surface *screen) const {
        if (!titleBarText || !titleBarTimer.Running()) return;
 
-       battle->Res().titleFrame->Draw(screen, framePosition, frameSize.X(), frameSize.Y());
+       parent->Res().titleFrame->Draw(screen, framePosition, frameSize.X(), frameSize.Y());
 
-       battle->Res().titleFont->DrawString(titleBarText, screen, textPosition);
+       parent->Res().titleFont->DrawString(titleBarText, screen, textPosition);
 }
 
 void PerformAttacks::RenderNumbers(SDL_Surface *screen) const {
@@ -258,13 +271,13 @@ void PerformAttacks::RenderTargetAnimation(SDL_Surface *screen) const {
        if (ts.TargetsHeroes()) {
                for (vector<Vector<int> >::size_type i(0), end(battle->NumHeroes()); i < end; ++i) {
                        if (ts.IsSelected(i)) {
-                               targetAnimation.DrawCenter(screen, battle->HeroAt(i).Position() + battle->ScreenOffset());
+                               targetAnimation.DrawCenter(screen, battle->HeroAt(i).Position() + parent->ScreenOffset());
                        }
                }
        } else {
                for (vector<Vector<int> >::size_type i(0), end(battle->MaxMonsters()); i < end; ++i) {
                        if (ts.IsSelected(i)) {
-                               targetAnimation.DrawCenter(screen, battle->MonsterAt(i).Position() + battle->ScreenOffset());
+                               targetAnimation.DrawCenter(screen, battle->MonsterAt(i).Position() + parent->ScreenOffset());
                        }
                }
        }