reworked Application's state stack

[l2e.git] / src / battle / BattleState.cpp

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index b11f52cc90b4950f73fd76641cc1699420d17bb3..2c5fe8174449ceb899f2bf7f8f634baff60304ba 100644 (file)
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -8,6 +8,7 @@
 #include "BattleState.h"
 
 #include "PartyLayout.h"
+#include "states/SelectMoveAction.h"
 #include "../app/Application.h"
 #include "../app/Input.h"
 #include "../geometry/operators.h"
@@ -47,15 +48,30 @@ void BattleState::Resize(int w, int h) {
 void BattleState::EnterState(Application &ctrl, SDL_Surface *screen) {
        monstersLayout->CalculatePositions(background->w, background->h, monsterPositions);
        heroesLayout->CalculatePositions(background->w, background->h, heroesPositions);
+       for (vector<Hero>::size_type i(0), end(heroes.size()); i < end; ++i) {
+               heroTags.push_back(HeroTag(&heroes[i], HeroTag::Alignment((i + 1) % 2)));
+       }
+}
+
+void BattleState::ExitState(Application &ctrl, SDL_Surface *screen) {
+
+}
+
+void BattleState::ResumeState(Application &ctrl, SDL_Surface *screen) {
+       // reset attack choices
+       activeHero = -1;
+       attackChoices.clear();
+       attackChoices.resize(heroes.size());
+       ctrl.PushState(new SelectMoveAction(this));
 }
 
-void BattleState::ExitState() {
+void BattleState::PauseState(Application &ctrl, SDL_Surface *screen) {
 
 }
 
 
 void BattleState::HandleInput(const Input &input) {
-       attackTypeMenu.ReadInput(input);
+
 }
 
 void BattleState::UpdateWorld(float deltaT) {
@@ -63,14 +79,12 @@ void BattleState::UpdateWorld(float deltaT) {
 }
 
 void BattleState::Render(SDL_Surface *screen) {
-       Vector<int> offset(
-                       (screen->w - background->w) / 2,
-                       (screen->h - background->h) / 2);
+       Vector<int> offset(CalculateScreenOffset(screen));
 
        RenderBackground(screen, offset);
        RenderMonsters(screen, offset);
 //     RenderHeroes(screen, offset);
-       attackTypeMenu.Render(screen, Point<int>(background->w / 2, background->h * 3 / 4));
+       RenderHeroTags(screen, offset);
 }
 
 void BattleState::RenderBackground(SDL_Surface *screen, const Vector<int> &offset) {
@@ -96,4 +110,20 @@ void BattleState::RenderHeroes(SDL_Surface *screen, const Vector<int> &offset) {
        }
 }
 
+void BattleState::RenderHeroTags(SDL_Surface *screen, const Vector<int> &offset) {
+       int uiHeight(BackgroundHeight() / 2), uiOffset(uiHeight);
+       int tagHeight((uiHeight - attackTypeMenu.IconHeight()) / 2);
+       int tagWidth((BackgroundWidth() - attackTypeMenu.IconWidth()) / 2);
+
+       Point<int> tagPosition[4];
+       tagPosition[0] = Point<int>(0, uiOffset);
+       tagPosition[1] = Point<int>(tagWidth + attackTypeMenu.IconWidth(), uiOffset);
+       tagPosition[2] = Point<int>(0, uiOffset + tagHeight + attackTypeMenu.IconHeight());
+       tagPosition[3] = Point<int>(tagWidth + attackTypeMenu.IconWidth(), uiOffset + tagHeight + attackTypeMenu.IconHeight());
+
+       for (vector<HeroTag>::size_type i(0), end(heroTags.size()); i < end; ++i) {
+               heroTags[i].Render(screen, tagWidth, tagHeight, tagPosition[i] + offset, (int)i == activeHero);
+       }
+}
+
 }