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

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index 9f1acac..a2c306a 100644
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -47,6 +47,9 @@ 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() {
@@ -55,7 +58,35 @@ void BattleState::ExitState() {
 
 
 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) {
@@ -69,7 +100,13 @@ void BattleState::Render(SDL_Surface *screen) {
 
 	RenderBackground(screen, offset);
 	RenderMonsters(screen, offset);
-	RenderHeroes(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) {
@@ -95,4 +132,34 @@ 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);
+
+	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(
+			(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);
+}
+
 }