switched geometric scalars from floating to fixed

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

diff --git a/src/battle/states/SelectSpell.cpp b/src/battle/states/SelectSpell.cpp
index 0708196b7b0cfde37de92974785e70499e7719f6..8c0c4da5687110eb1cf3ae574a2e0bf2ccc5ee64 100644 (file)
--- a/src/battle/states/SelectSpell.cpp
+++ b/src/battle/states/SelectSpell.cpp
@@ -14,41 +14,38 @@
 #include "../../app/Application.h"
 #include "../../app/Input.h"
 #include "../../common/Spell.h"
-#include "../../geometry/operators.h"
-#include "../../geometry/Point.h"
 #include "../../graphics/Frame.h"
 
 using app::Application;
 using app::Input;
 using common::Spell;
-using geometry::Point;
-using geometry::Vector;
+using math::Vector;
 using graphics::Frame;
 
 namespace battle {
 
-void SelectSpell::EnterState(Application &c, SDL_Surface *screen) {
-       ctrl = &c;
+void SelectSpell::OnEnterState(SDL_Surface *screen) {
+
 }
 
-void SelectSpell::ExitState(Application &c, SDL_Surface *screen) {
-       ctrl = 0;
+void SelectSpell::OnExitState(SDL_Surface *screen) {
+
 }
 
-void SelectSpell::ResumeState(Application &ctrl, 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::PauseState(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) {
 
 }
 
@@ -62,26 +59,25 @@ void SelectSpell::HandleEvents(const Input &input) {
                        if (spell->GetTargetingMode().TargetsAlly()) {
                                ac.Selection().SelectHeroes();
                        } else {
-                               ac.Selection().SelectEnemies();
+                               ac.Selection().SelectMonsters();
                        }
                        if (spell->GetTargetingMode().TargetsAll()) {
                                ac.SetType(AttackChoice::MAGIC);
-                               // TODO: remove item from inventory
                                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(), battle->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();
@@ -97,7 +93,7 @@ void SelectSpell::HandleEvents(const Input &input) {
        }
 }
 
-void SelectSpell::UpdateWorld(float deltaT) {
+void SelectSpell::UpdateWorld(Uint32 deltaT) {
 
 }
 
@@ -111,7 +107,7 @@ void SelectSpell::Render(SDL_Surface *screen) {
 
 void SelectSpell::RenderFrame(SDL_Surface *screen, const Vector<int> &offset) {
        const Frame *frame(battle->Res().selectFrame);
-       Point<int> position(frame->BorderWidth(), frame->BorderHeight());
+       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);
@@ -119,7 +115,7 @@ void SelectSpell::RenderFrame(SDL_Surface *screen, const Vector<int> &offset) {
 
 void SelectSpell::RenderHeadline(SDL_Surface *screen, const Vector<int> &offset) {
        const Resources &res(battle->Res());
-       Point<int> position(
+       Vector<int> position(
                        2 * res.selectFrame->BorderWidth() + res.normalFont->CharWidth(),
                        2 * res.selectFrame->BorderHeight());
        res.normalFont->DrawString(res.spellMenuHeadline, screen, position + offset);
@@ -127,7 +123,7 @@ void SelectSpell::RenderHeadline(SDL_Surface *screen, const Vector<int> &offset)
 
 void SelectSpell::RenderMenu(SDL_Surface *screen, const Vector<int> &offset) {
        const Resources &res(battle->Res());
-       Point<int> position(
+       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);