extracted battle logic into a class

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

diff --git a/src/battle/states/SelectSpell.cpp b/src/battle/states/SelectSpell.cpp
index 7b918b4c98c762b71015c4213870bcf093c6bf4f..2b22e70fcd856e124fac407f047bd682b8aa6ed8 100644 (file)
--- a/src/battle/states/SelectSpell.cpp
+++ b/src/battle/states/SelectSpell.cpp
@@ -18,6 +18,13 @@ using graphics::Frame;
 
 namespace battle {
 
+SelectSpell::SelectSpell(Battle *battle, SelectAttackType *parent)
+: battle(battle)
+, parent(parent) {
+
+}
+
+
 void SelectSpell::OnEnterState(SDL_Surface *screen) {
        OnResize(screen->w, screen->h);
 }
@@ -40,14 +47,14 @@ void SelectSpell::OnPauseState(SDL_Surface *screen) {
 
 
 void SelectSpell::OnResize(int width, int height) {
-       const Vector<int> offset = battle->ScreenOffset();
+       const Vector<int> offset = parent->ScreenOffset();
 
-       const Resources &res = battle->Res();
+       const Resources &res = parent->Res();
        const Frame &frame = *res.selectFrame;
 
        framePosition = offset + frame.BorderSize();
        frameSize = Vector<int>(
-                       battle->Width() - 2 * frame.BorderWidth(),
+                       parent->Width() - 2 * frame.BorderWidth(),
                        res.normalFont->CharHeight() * 13);
 
        headlinePosition = offset + Vector<int>(
@@ -82,7 +89,7 @@ void SelectSpell::HandleEvents(const Input &input) {
                                } else {
                                        ac.Selection().SetMultiple();
                                }
-                               Ctrl().PushState(new SelectTarget(battle, parent, &ac.Selection(), battle->Res().magicTargetCursor));
+                               Ctrl().PushState(new SelectTarget(battle, parent, &ac.Selection(), parent->Res().magicTargetCursor));
                        }
                }
        }
@@ -115,12 +122,12 @@ void SelectSpell::Render(SDL_Surface *screen) {
 }
 
 void SelectSpell::RenderFrame(SDL_Surface *screen) {
-       const Frame &frame = *battle->Res().selectFrame;
+       const Frame &frame = *parent->Res().selectFrame;
        frame.Draw(screen, framePosition, frameSize.X(), frameSize.Y());
 }
 
 void SelectSpell::RenderHeadline(SDL_Surface *screen) {
-       const Resources &res = battle->Res();
+       const Resources &res = parent->Res();
        res.normalFont->DrawString(res.spellMenuHeadline, screen, headlinePosition);
 }