X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.cpp;h=4e12f7929a5be2ada8fa319e6ce275827375fae0;hb=4d0a650b178d81387caa36953ed06cc5d6c28213;hp=b11f52cc90b4950f73fd76641cc1699420d17bb3;hpb=c0860451b5fd681c3b3b8d985e8831276bbd917f;p=l2e.git

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index b11f52c..4e12f79 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,6 +48,10 @@ 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)));
+	}
+	ctrl.PushState(new SelectMoveAction(this));
 }
 
 void BattleState::ExitState() {
@@ -55,7 +60,7 @@ void BattleState::ExitState() {
 
 
 void BattleState::HandleInput(const Input &input) {
-	attackTypeMenu.ReadInput(input);
+
 }
 
 void BattleState::UpdateWorld(float deltaT) {
@@ -63,14 +68,13 @@ 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);
+	RenderAttackTypeMenu(screen, offset);
 }
 
 void BattleState::RenderBackground(SDL_Surface *screen, const Vector<int> &offset) {
@@ -96,4 +100,27 @@ 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, i == activeHero);
+	}
+}
+
+void BattleState::RenderAttackTypeMenu(SDL_Surface *screen, const Vector<int> &offset) {
+	Point<int> position(
+			(BackgroundWidth() - attackTypeMenu.Width()) / 2,
+			(BackgroundHeight() * 3 / 4) - (attackTypeMenu.Height() / 2));
+	attackTypeMenu.Render(screen, position + offset);
+}
+
 }