X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.cpp;h=2b46cacb879f405eb5d1118dc94d62d709fc8a59;hb=c8dccd84477d10dcd3ec884478a9f26c16b54ad7;hp=758d9d8224a097d2b0cdd731dfc00dac17117b59;hpb=010a336797f1419945bed60560cc61fb492793f4;p=l2e.git

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index 758d9d8..2b46cac 100644
--- 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,18 +48,31 @@ 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);
+	attackChoices.resize(heroes.size());
 	for (vector<Hero>::size_type i(0), end(heroes.size()); i < end; ++i) {
-		heroTags.push_back(HeroTag(&heroes[i], HeroTag::Alignment((i + 1) % 2)));
+		heroTags.push_back(HeroTag(&heroes[i], &attackChoices[i], heroTagFrame, activeHeroTagFrame, HeroTag::Alignment((i + 1) % 2)));
 	}
 }
 
-void BattleState::ExitState() {
+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::PauseState(Application &ctrl, SDL_Surface *screen) {
 
 }
 
 
 void BattleState::HandleInput(const Input &input) {
-	attackTypeMenu.ReadInput(input);
+
 }
 
 void BattleState::UpdateWorld(float deltaT) {
@@ -66,15 +80,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);
 	RenderHeroTags(screen, offset);
-	RenderAttackTypeMenu(screen, offset);
 }
 
 void BattleState::RenderBackground(SDL_Surface *screen, const Vector<int> &offset) {
@@ -101,26 +112,20 @@ void BattleState::RenderHeroes(SDL_Surface *screen, const Vector<int> &offset) {
 }
 
 void BattleState::RenderHeroTags(SDL_Surface *screen, const Vector<int> &offset) {
-	int uiHeight(background->h / 2), uiOffset(uiHeight);
-	int tagHeight((uiHeight - attackTypeMenu.IconHeight()) / 2);
-	int tagWidth((background->w - attackTypeMenu.IconWidth()) / 2);
+	int margin(attackTypeMenu.Height() / 48);
+	int tagHeight(attackTypeMenu.Height() - 2 * margin);
+	int tagWidth(attackTypeMenu.Width() * 2 + attackTypeMenu.Width() / 2 - 2 * margin);
+	int xOffset((BackgroundWidth() - 2 * tagWidth - 2 * margin) / 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());
+	tagPosition[0] = Point<int>(xOffset, BackgroundHeight() - 2 * tagHeight - margin);
+	tagPosition[1] = Point<int>(xOffset + tagWidth + 2 * margin, BackgroundHeight() - 2 * tagHeight - margin);
+	tagPosition[2] = Point<int>(xOffset, BackgroundHeight() - tagHeight - margin);
+	tagPosition[3] = Point<int>(xOffset + tagWidth + 2 * margin, BackgroundHeight() - tagHeight - margin);
 
 	for (vector<HeroTag>::size_type i(0), end(heroTags.size()); i < end; ++i) {
-		heroTags[i].Render(screen, tagWidth, tagHeight, tagPosition[i] + offset);
+		heroTags[i].Render(screen, tagWidth, tagHeight, tagPosition[i] + offset, (int)i == activeHero);
 	}
 }
 
-void BattleState::RenderAttackTypeMenu(SDL_Surface *screen, const Vector<int> &offset) {
-	Point<int> position(
-			(background->w - attackTypeMenu.Width()) / 2,
-			(background->h * 3 / 4) - (attackTypeMenu.Height() / 2));
-	attackTypeMenu.Render(screen, position + offset);
-}
-
 }