switched geometric scalars from floating to fixed

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

diff --git a/src/battle/states/SwapHeroes.cpp b/src/battle/states/SwapHeroes.cpp
index f01e60da8603f862f97ad541a321d24c0bad750d..da2342b14bcffd3e7f60e1842135a6e4effd7623 100644 (file)
--- a/src/battle/states/SwapHeroes.cpp
+++ b/src/battle/states/SwapHeroes.cpp
@@ -11,35 +11,32 @@
 #include "../BattleState.h"
 #include "../../app/Application.h"
 #include "../../app/Input.h"
-#include "../../geometry/operators.h"
-#include "../../geometry/Point.h"
 
 using app::Application;
 using app::Input;
-using geometry::Point;
-using geometry::Vector;
+using math::Vector;
 using std::vector;
 
 namespace battle {
 
-void SwapHeroes::EnterState(Application &c, SDL_Surface *screen) {
-       ctrl = &c;
+void SwapHeroes::OnEnterState(SDL_Surface *screen) {
+
 }
 
-void SwapHeroes::ExitState(Application &c, SDL_Surface *screen) {
-       ctrl = 0;
+void SwapHeroes::OnExitState(SDL_Surface *screen) {
+
 }
 
-void SwapHeroes::ResumeState(Application &ctrl, SDL_Surface *screen) {
+void SwapHeroes::OnResumeState(SDL_Surface *screen) {
 
 }
 
-void SwapHeroes::PauseState(Application &ctrl, SDL_Surface *screen) {
+void SwapHeroes::OnPauseState(SDL_Surface *screen) {
 
 }
 
 
-void SwapHeroes::Resize(int width, int height) {
+void SwapHeroes::OnResize(int width, int height) {
 
 }
 
@@ -57,7 +54,7 @@ void SwapHeroes::HandleEvents(const Input &input) {
                if (cursor == selected) {
                        selected = -1;
                } else {
-                       ctrl->PopState();
+                       Ctrl().PopState();
                }
        }
 
@@ -108,12 +105,12 @@ void SwapHeroes::MoveLeft() {
        if (cursor > 0) {
                --cursor;
        } else {
-               cursor = battle->Heroes().size();
+               cursor = battle->NumHeroes();
        }
 }
 
 
-void SwapHeroes::UpdateWorld(float deltaT) {
+void SwapHeroes::UpdateWorld(Uint32 deltaT) {
 
 }
 
@@ -123,19 +120,19 @@ void SwapHeroes::Render(SDL_Surface *screen) {
        RenderCursors(screen, offset);
 }
 
-void SwapHeroes::RenderCursors(SDL_Surface *screen, const geometry::Vector<int> &offset) {
+void SwapHeroes::RenderCursors(SDL_Surface *screen, const math::Vector<int> &offset) {
        // offset the cursor by 1/8th to the left and bottom
        Vector<int> cursorOffset(battle->Res().swapCursor->Width() / -8, battle->Res().swapCursor->Height() / 8);
        Vector<int> indicatorOffset(0, 0);
-       vector<Point<int> > positions;
-       for (vector<Hero>::size_type i(0), end(battle->Heroes().size()); i < end; ++i) {
+       vector<Vector<int> > positions;
+       for (int i(0), end(battle->NumHeroes()); i < end; ++i) {
                Vector<int> positionCorrection(battle->Res().swapCursor->Width() / 2, battle->HeroTagAt(i).HeroSprite()->Height() - battle->Res().swapCursor->Height() / 2);
                // indicator offsets are inverted for heroes
                positionCorrection -= cursorOffset;
                positions.push_back(battle->HeroTagPositionAt(i) + battle->HeroTagAt(i).HeroOffset() + positionCorrection);
        }
        if (flipFlop) {
-               for (vector<Point<int> >::size_type i(0); i < positions.size(); ++i) {
+               for (vector<Vector<int> >::size_type i(0); i < positions.size(); ++i) {
                        if (selected == int(i)) {
                                battle->Res().swapCursor->DrawTopRight(screen, positions[i] + offset);
                        }