cached some of the battle coordinates

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

diff --git a/src/battle/states/PerformAttacks.cpp b/src/battle/states/PerformAttacks.cpp
index bc6a11894dc0d369cacad07dd6a63c3a80cd2670..92e5185cf70488a5ce8baf9a330011ef7ba51934 100644 (file)
--- a/src/battle/states/PerformAttacks.cpp
+++ b/src/battle/states/PerformAttacks.cpp
@@ -27,6 +27,7 @@ void PerformAttacks::OnEnterState(SDL_Surface *screen) {
        battle->CalculateAttackOrder();
        numberAnimation.reserve(battle->MaxMonsters() > battle->NumHeroes() + 1 ? battle->MaxMonsters() : battle->NumHeroes() + 1);
        numberPosition.reserve(numberAnimation.size());
+       OnResize(screen->w, screen->h);
 }
 
 void PerformAttacks::OnExitState(SDL_Surface *screen) {
@@ -43,7 +44,11 @@ void PerformAttacks::OnPauseState(SDL_Surface *screen) {
 
 
 void PerformAttacks::OnResize(int width, int height) {
-
+       const Resources &res = battle->Res();
+       framePosition = battle->ScreenOffset();
+       frameSize = Vector<int>(
+                       battle->Width(),
+                       res.titleFrame->BorderHeight() * 2 + res.titleFont->CharHeight());
 }
 
 
@@ -119,7 +124,12 @@ void PerformAttacks::HandleEvents(const Input &input) {
                }
        }
 
-       if (titleBarText) titleBarTimer = GraphicsTimers().StartCountdown(850);
+       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());
+       }
        if (moveAnimation.Valid()) {
                moveAnimation.Start(*this);
                if (battle->CurrentAttack().IsMonster()) {
@@ -143,11 +153,11 @@ void PerformAttacks::AddNumberAnimations(const TargetSelection &ts) {
                        if (ts.IsBad(i)) {
                                numberAnimation.push_back(NumberAnimation(ts.GetAmount(i), battle->Res().numberAnimationPrototype, battle->Res().bigNumberSprite));
                                numberPosition.push_back(
-                                               battle->MonsterAt(i).Position());
+                                               battle->MonsterAt(i).Position() + battle->ScreenOffset());
                        } else if (ts.IsGood(i)) {
                                numberAnimation.push_back(NumberAnimation(ts.GetAmount(i), battle->Res().numberAnimationPrototype, battle->Res().greenNumberSprite));
                                numberPosition.push_back(
-                                               battle->MonsterAt(i).Position());
+                                               battle->MonsterAt(i).Position() + battle->ScreenOffset());
                        }
                }
        } else {
@@ -155,11 +165,11 @@ void PerformAttacks::AddNumberAnimations(const TargetSelection &ts) {
                        if (ts.IsBad(i)) {
                                numberAnimation.push_back(NumberAnimation(ts.GetAmount(i), battle->Res().numberAnimationPrototype, battle->Res().bigNumberSprite));
                                numberPosition.push_back(
-                                               battle->HeroAt(i).Position());
+                                               battle->HeroAt(i).Position() + battle->ScreenOffset());
                        } else if (ts.IsGood(i)) {
                                numberAnimation.push_back(NumberAnimation(ts.GetAmount(i), battle->Res().numberAnimationPrototype, battle->Res().greenNumberSprite));
                                numberPosition.push_back(
-                                               battle->HeroAt(i).Position());
+                                               battle->HeroAt(i).Position() + battle->ScreenOffset());
                        }
                }
        }
@@ -215,51 +225,46 @@ void PerformAttacks::UpdateWorld(Uint32 deltaT) {
 }
 
 void PerformAttacks::Render(SDL_Surface *screen) {
-       Vector<int> offset(battle->CalculateScreenOffset(screen));
-       battle->RenderBackground(screen, offset);
-       battle->RenderMonsters(screen, offset);
-       battle->RenderHeroes(screen, offset);
-       battle->RenderCapsule(screen, offset);
-       battle->RenderSmallHeroTags(screen, offset);
-       RenderTitleBar(screen, offset);
-       RenderNumbers(screen, offset);
-       RenderTargetAnimation(screen, offset);
+       battle->RenderBackground(screen);
+       battle->RenderMonsters(screen);
+       battle->RenderHeroes(screen);
+       battle->RenderCapsule(screen);
+       battle->RenderSmallHeroTags(screen);
+       RenderTitleBar(screen);
+       RenderNumbers(screen);
+       RenderTargetAnimation(screen);
 }
 
-void PerformAttacks::RenderTitleBar(SDL_Surface *screen, const Vector<int> &offset) const {
+void PerformAttacks::RenderTitleBar(SDL_Surface *screen) const {
        if (!titleBarText || !titleBarTimer.Running()) return;
 
-       int height(battle->Res().titleFrame->BorderHeight() * 2 + battle->Res().titleFont->CharHeight());
-       battle->Res().titleFrame->Draw(screen, offset, battle->Width(), height);
+       battle->Res().titleFrame->Draw(screen, framePosition, frameSize.X(), frameSize.Y());
 
-       Vector<int> textPosition(
-                       (battle->Width() - (std::strlen(titleBarText) * battle->Res().titleFont->CharWidth())) / 2,
-                       battle->Res().titleFrame->BorderHeight());
-       battle->Res().titleFont->DrawString(titleBarText, screen, textPosition + offset);
+       battle->Res().titleFont->DrawString(titleBarText, screen, textPosition);
 }
 
-void PerformAttacks::RenderNumbers(SDL_Surface *screen, const Vector<int> &offset) const {
+void PerformAttacks::RenderNumbers(SDL_Surface *screen) const {
        for (vector<NumberAnimation>::size_type i(0), end(numberAnimation.size()); i < end; ++i) {
                if (numberAnimation[i].Running()) {
                        Vector<int> align(numberAnimation[i].Width() / -2, numberAnimation[i].Height() * -3 / 4);
-                       numberAnimation[i].Draw(screen, numberPosition[i] + align + offset);
+                       numberAnimation[i].Draw(screen, numberPosition[i] + align);
                }
        }
 }
 
-void PerformAttacks::RenderTargetAnimation(SDL_Surface *screen, const math::Vector<int> &offset) const {
+void PerformAttacks::RenderTargetAnimation(SDL_Surface *screen) const {
        if (!targetAnimation.Valid() || !targetAnimation.Running()) return;
        const TargetSelection &ts(battle->CurrentAttackAttackChoice().Selection());
        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() + offset);
+                               targetAnimation.DrawCenter(screen, battle->HeroAt(i).Position() + battle->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() + offset);
+                               targetAnimation.DrawCenter(screen, battle->MonsterAt(i).Position() + battle->ScreenOffset());
                        }
                }
        }