renamed namespace geometry -> math

[l2e.git] / src / menu / SelectHero.cpp

diff --git a/src/menu/SelectHero.cpp b/src/menu/SelectHero.cpp
index 74e6f88ad9fd1a67310c653da7402dfb0f6e1dfc..e573d323c144562a2f78bd79f5559119cbf7c0e7 100644 (file)
--- a/src/menu/SelectHero.cpp
+++ b/src/menu/SelectHero.cpp
@@ -1,10 +1,3 @@
-/*
- * SelectHero.cpp
- *
- *  Created on: Oct 22, 2012
- *      Author: holy
- */
-
 #include "SelectHero.h"
 
 #include "HeroStatus.h"
@@ -15,16 +8,18 @@
 #include "../common/GameConfig.h"
 #include "../common/GameState.h"
 #include "../common/Hero.h"
-#include "../geometry/Vector.h"
+#include "../math/Vector.h"
 #include "../graphics/Sprite.h"
 
 using app::Input;
-using geometry::Vector;
+using math::Vector;
 
 namespace menu {
 
-SelectHero::SelectHero(PartyMenu *parent, Callback cb, int cursor)
+SelectHero::SelectHero(app::State *parent, PartyMenu *pm, void *ref, Callback cb, int cursor)
 : parent(parent)
+, partyMenu(pm)
+, ref(ref)
 , callback(cb)
 , cursor(cursor) {
 
@@ -55,7 +50,7 @@ void SelectHero::OnResize(int width, int height) {
 
 void SelectHero::HandleEvents(const Input &input) {
        if (input.JustPressed(Input::ACTION_A)) {
-               callback(parent, cursor);
+               callback(ref, cursor);
        }
        if (input.JustPressed(Input::ACTION_B)) {
                Ctrl().PopState();
@@ -73,40 +68,40 @@ void SelectHero::HandleEvents(const Input &input) {
 }
 
 void SelectHero::SelectUp() {
-       cursor = (cursor + 2) % parent->Game().state->partySize;
+       cursor = (cursor + 2) % partyMenu->Game().state->partySize;
        cursorBlink.Restart();
 }
 
 void SelectHero::SelectRight() {
-       cursor = (cursor + 1) % parent->Game().state->partySize;
+       cursor = (cursor + 1) % partyMenu->Game().state->partySize;
        cursorBlink.Restart();
 }
 
 void SelectHero::SelectDown() {
-       cursor = (cursor + 2) % parent->Game().state->partySize;
+       cursor = (cursor + 2) % partyMenu->Game().state->partySize;
        cursorBlink.Restart();
 }
 
 void SelectHero::SelectLeft() {
-       cursor = (cursor + 3) % parent->Game().state->partySize;
+       cursor = (cursor + 3) % partyMenu->Game().state->partySize;
        cursorBlink.Restart();
 }
 
 
 common::GameConfig &SelectHero::Game() {
-       return parent->Game();
+       return partyMenu->Game();
 }
 
 const common::GameConfig &SelectHero::Game() const {
-       return parent->Game();
+       return partyMenu->Game();
 }
 
 Resources &SelectHero::Res() {
-       return parent->Res();
+       return partyMenu->Res();
 }
 
 const Resources &SelectHero::Res() const {
-       return parent->Res();
+       return partyMenu->Res();
 }
 
 
@@ -125,7 +120,7 @@ void SelectHero::Render(SDL_Surface *screen) {
 void SelectHero::RenderCursor(SDL_Surface *screen) const {
        Vector<int> position(
                        0, Game().state->party[cursor]->BattleSprite()->Height());
-       position += parent->StatusOffset(cursor);
+       position += partyMenu->StatusOffset(cursor);
        Res().heroCursor->Draw(screen, position);
 }