X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.cpp;h=f1e3d07caffc17676d1d5bcd85bc8b5f19a75c1b;hb=7b2600e51a05efe1c102389a25b8123f30a972b0;hp=a2c306a2ef7050d1fd9d0a468d768d152962229b;hpb=628b3a7276d0b330719e05504b23bafcf88f8fca;p=l2e.git

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index a2c306a..f1e3d07 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,46 +48,32 @@ 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, healthGauge, manaGauge, ikariGauge, heroTagSprites, heroTagFont, HeroTag::Alignment((i + 1) % 2)));
 	}
 }
 
-void BattleState::ExitState() {
+void BattleState::ExitState(Application &ctrl, SDL_Surface *screen) {
+
+}
+
+void BattleState::ResumeState(Application &ctrl, SDL_Surface *screen) {
+	// TODO: check for victory, defeat or run
+	// 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) {
-	if (moveChoice == -1) {
-		if (input.IsDown(Input::PAD_UP)) {
-			moveMenu.Select(MoveMenu::CHANGE);
-		} else if (input.IsDown(Input::PAD_DOWN)) {
-			moveMenu.Select(MoveMenu::RUN);
-		} else {
-			moveMenu.Select(MoveMenu::ATTACK);
-		}
-
-		if (input.JustPressed(Input::ACTION_A)) {
-			moveChoice = moveMenu.Selected();
-		}
-	} else {
-		if (input.IsDown(Input::PAD_UP)) {
-			attackTypeMenu.Select(AttackTypeMenu::MAGIC);
-		} else if (input.IsDown(Input::PAD_RIGHT)) {
-			attackTypeMenu.Select(AttackTypeMenu::DEFEND);
-		} else if (input.IsDown(Input::PAD_DOWN)) {
-			attackTypeMenu.Select(AttackTypeMenu::IKARI);
-		} else if (input.IsDown(Input::PAD_LEFT)) {
-			attackTypeMenu.Select(AttackTypeMenu::ITEM);
-		} else {
-			attackTypeMenu.Select(AttackTypeMenu::SWORD);
-		}
-
-		if (input.JustPressed(Input::ACTION_A)) {
-			activeHero = (activeHero + 1) % 4;
-		}
-	}
+
 }
 
 void BattleState::UpdateWorld(float deltaT) {
@@ -94,19 +81,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);
-	if (moveChoice == -1) {
-		RenderMoveMenu(screen, offset);
-	} else {
-		RenderAttackTypeMenu(screen, offset);
-	}
 }
 
 void BattleState::RenderBackground(SDL_Surface *screen, const Vector<int> &offset) {
@@ -133,33 +113,19 @@ 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 tagHeight(attackTypeMenu.Height());
+	int tagWidth(attackTypeMenu.Width() * 2 + attackTypeMenu.Width() / 2);
+	int xOffset((BackgroundWidth() - 2 * tagWidth) / 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);
+	tagPosition[1] = Point<int>(xOffset + tagWidth, BackgroundHeight() - 2 * tagHeight);
+	tagPosition[2] = Point<int>(xOffset, BackgroundHeight() - tagHeight);
+	tagPosition[3] = Point<int>(xOffset + tagWidth, BackgroundHeight() - tagHeight);
 
 	for (vector<HeroTag>::size_type i(0), end(heroTags.size()); i < end; ++i) {
-		heroTags[i].Render(screen, tagWidth, tagHeight, tagPosition[i] + offset, i == activeHero);
+		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);
-}
-
-void BattleState::RenderMoveMenu(SDL_Surface *screen, const Vector<int> &offset) {
-	Point<int> position(
-			(background->w - moveMenu.Width()) / 2,
-			(background->h * 3 / 4) - (moveMenu.Height() / 2));
-	moveMenu.Render(screen, position + offset);
-}
-
 }