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 cdf9b698fe9405416d803cbe33d25c42609c94d4..2b22e70fcd856e124fac407f047bd682b8aa6ed8 100644 (file)
--- a/src/battle/states/SelectSpell.cpp
+++ b/src/battle/states/SelectSpell.cpp
@@ -1,10 +1,3 @@
-/*
- * SelectSpell.cpp
- *
- *  Created on: Aug 8, 2012
- *      Author: holy
- */
-
 #include "SelectSpell.h"
 
 #include "SelectAttackType.h"
@@ -15,38 +8,62 @@
 #include "../../app/Input.h"
 #include "../../common/Spell.h"
 #include "../../graphics/Frame.h"
+#include "../../math/Vector.h"
 
 using app::Application;
 using app::Input;
 using common::Spell;
-using geometry::Vector;
+using math::Vector;
 using graphics::Frame;
 
 namespace battle {
 
-void SelectSpell::OnEnterState(Application &c, SDL_Surface *screen) {
-       ctrl = &c;
+SelectSpell::SelectSpell(Battle *battle, SelectAttackType *parent)
+: battle(battle)
+, parent(parent) {
+
 }
 
-void SelectSpell::OnExitState(Application &c, SDL_Surface *screen) {
-       ctrl = 0;
+
+void SelectSpell::OnEnterState(SDL_Surface *screen) {
+       OnResize(screen->w, screen->h);
 }
 
-void SelectSpell::OnResumeState(Application &ctrl, SDL_Surface *screen) {
+void SelectSpell::OnExitState(SDL_Surface *screen) {
+
+}
+
+void SelectSpell::OnResumeState(SDL_Surface *screen) {
        if (battle->ActiveHero().GetAttackChoice().Selection().HasSelected()) {
                battle->ActiveHero().GetAttackChoice().SetType(AttackChoice::MAGIC);
                battle->ActiveHero().GetAttackChoice().SetSpell(battle->ActiveHero().SpellMenu().Selected());
-               ctrl.PopState();
+               Ctrl().PopState();
        }
 }
 
-void SelectSpell::OnPauseState(Application &ctrl, SDL_Surface *screen) {
+void SelectSpell::OnPauseState(SDL_Surface *screen) {
 
 }
 
 
-void SelectSpell::Resize(int width, int height) {
+void SelectSpell::OnResize(int width, int height) {
+       const Vector<int> offset = parent->ScreenOffset();
+
+       const Resources &res = parent->Res();
+       const Frame &frame = *res.selectFrame;
+
+       framePosition = offset + frame.BorderSize();
+       frameSize = Vector<int>(
+                       parent->Width() - 2 * frame.BorderWidth(),
+                       res.normalFont->CharHeight() * 13);
+
+       headlinePosition = offset + Vector<int>(
+                       2 * frame.BorderWidth() + res.normalFont->CharWidth(),
+                       2 * frame.BorderHeight());
 
+       menuPosition = offset + Vector<int>(
+                       2 * frame.BorderWidth() + res.normalFont->CharWidth(),
+                       2 * frame.BorderHeight() + 2 * res.normalFont->CharHeight());
 }
 
 
@@ -65,19 +82,19 @@ void SelectSpell::HandleEvents(const Input &input) {
                                ac.SetType(AttackChoice::MAGIC);
                                ac.SetSpell(spell);
                                battle->NextHero();
-                               ctrl->PopState();
+                               Ctrl().PopState();
                        } else {
                                if (spell->GetTargetingMode().TargetsSingle()) {
                                        ac.Selection().SetSingle();
                                } 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));
                        }
                }
        }
        if (input.JustPressed(Input::ACTION_B)) {
-               ctrl->PopState(); // return control to parent
+               Ctrl().PopState(); // return control to parent
        }
        if (input.JustPressed(Input::PAD_UP)) {
                battle->ActiveHero().SpellMenu().PreviousRow();
@@ -93,40 +110,29 @@ void SelectSpell::HandleEvents(const Input &input) {
        }
 }
 
-void SelectSpell::UpdateWorld(float deltaT) {
+void SelectSpell::UpdateWorld(Uint32 deltaT) {
 
 }
 
 void SelectSpell::Render(SDL_Surface *screen) {
        parent->Render(screen);
-       Vector<int> offset(battle->CalculateScreenOffset(screen));
-       RenderFrame(screen, offset);
-       RenderHeadline(screen, offset);
-       RenderMenu(screen, offset);
+       RenderFrame(screen);
+       RenderHeadline(screen);
+       RenderMenu(screen);
 }
 
-void SelectSpell::RenderFrame(SDL_Surface *screen, const Vector<int> &offset) {
-       const Frame *frame(battle->Res().selectFrame);
-       Vector<int> position(frame->BorderSize());
-       int width(battle->Width() - 2 * frame->BorderWidth());
-       int height(battle->Res().normalFont->CharHeight() * 13);
-       frame->Draw(screen, position + offset, width, height);
+void SelectSpell::RenderFrame(SDL_Surface *screen) {
+       const Frame &frame = *parent->Res().selectFrame;
+       frame.Draw(screen, framePosition, frameSize.X(), frameSize.Y());
 }
 
-void SelectSpell::RenderHeadline(SDL_Surface *screen, const Vector<int> &offset) {
-       const Resources &res(battle->Res());
-       Vector<int> position(
-                       2 * res.selectFrame->BorderWidth() + res.normalFont->CharWidth(),
-                       2 * res.selectFrame->BorderHeight());
-       res.normalFont->DrawString(res.spellMenuHeadline, screen, position + offset);
+void SelectSpell::RenderHeadline(SDL_Surface *screen) {
+       const Resources &res = parent->Res();
+       res.normalFont->DrawString(res.spellMenuHeadline, screen, headlinePosition);
 }
 
-void SelectSpell::RenderMenu(SDL_Surface *screen, const Vector<int> &offset) {
-       const Resources &res(battle->Res());
-       Vector<int> position(
-                       2 * res.selectFrame->BorderWidth() + res.normalFont->CharWidth(),
-                       2 * res.selectFrame->BorderHeight() + 2 * res.normalFont->CharHeight());
-       battle->ActiveHero().SpellMenu().Draw(screen, position + offset);
+void SelectSpell::RenderMenu(SDL_Surface *screen) {
+       battle->ActiveHero().SpellMenu().Draw(screen, menuPosition);
 }
 
 }