X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.cpp;h=9e84206b3908dde82be2eba8fec5da82bf4e8661;hb=4956380d5109fe57722a968ad1ffbf2fa0a5ed2e;hp=3f734f84d8ce5bc868f15ad8ea041f2439fce99b;hpb=4170813213bafe6f4a01a79bf42308ddb7f3c545;p=l2e.git

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index 3f734f8..9e84206 100644
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -9,6 +9,7 @@
 
 #include "PartyLayout.h"
 #include "states/SelectMoveAction.h"
+#include "states/PerformAttacks.h"
 #include "../app/Application.h"
 #include "../app/Input.h"
 #include "../common/Ikari.h"
@@ -18,6 +19,7 @@
 #include "../geometry/operators.h"
 #include "../graphics/Sprite.h"
 
+#include <algorithm>
 #include <stdexcept>
 
 using app::Application;
@@ -47,6 +49,11 @@ void BattleState::AddHero(const Hero &h) {
 	heroes.push_back(h);
 }
 
+void BattleState::SwapHeroes(std::vector<Hero>::size_type lhs, std::vector<Hero>::size_type rhs) {
+	if (lhs < 0 || lhs >= heroes.size() || rhs < 0 || rhs >= heroes.size() || lhs == rhs) return;
+	std::swap(heroes[lhs], heroes[rhs]);
+}
+
 
 void BattleState::Resize(int w, int h) {
 
@@ -57,11 +64,11 @@ 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) {
-		spellMenus.push_back(res->spellMenuPrototype);
+		spellMenus[i] = res->spellMenuPrototype;
 		LoadSpellMenu(i);
-		ikariMenus.push_back(res->ikariMenuPrototype);
+		ikariMenus[i] = res->ikariMenuPrototype;
 		LoadIkariMenu(i);
-		heroTags[i] = HeroTag(&heroes[i], attackChoices + i, res, HeroTag::Alignment((i + 1) % 2));
+		heroTags[i] = HeroTag(this, i);
 	}
 
 	int tagHeight(attackTypeMenu.Height());
@@ -174,6 +181,7 @@ void BattleState::LoadInventory() {
 			itemMenu.AddEmptyEntry();
 		}
 	}
+	ClearAllAttacks();
 }
 
 void BattleState::ExitState(Application &ctrl, SDL_Surface *screen) {
@@ -181,13 +189,16 @@ 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;
-	for (vector<Hero>::size_type i(0), end(heroes.size()); i < end; ++i) {
-		attackChoices[i] = AttackChoice(this);
+	// TODO: check for victory or defeat
+	if (ranAway) {
+		ctrl.PopState(); // quit the battle scene
+		return;
+	}
+	if (AttackSelectionDone()) {
+		ctrl.PushState(new PerformAttacks(this));
+	} else {
+		ctrl.PushState(new SelectMoveAction(this));
 	}
-	ctrl.PushState(new SelectMoveAction(this));
 }
 
 void BattleState::PauseState(Application &ctrl, SDL_Surface *screen) {
@@ -195,7 +206,15 @@ void BattleState::PauseState(Application &ctrl, SDL_Surface *screen) {
 }
 
 
-void BattleState::HandleInput(const Input &input) {
+void BattleState::ClearAllAttacks() {
+	activeHero = -1;
+	for (vector<Hero>::size_type i(0), end(heroes.size()); i < end; ++i) {
+		attackChoices[i] = AttackChoice(this);
+	}
+}
+
+
+void BattleState::HandleEvents(const Input &input) {
 
 }
 
@@ -231,7 +250,7 @@ void BattleState::RenderMonsters(SDL_Surface *screen, const Vector<int> &offset)
 
 void BattleState::RenderHeroes(SDL_Surface *screen, const Vector<int> &offset) {
 	for (vector<Hero>::size_type i(0), end(heroes.size()); i < end; ++i) {
-		heroes[i].Sprite()->DrawCenterBottom(screen, heroesPositions[i] + offset);
+		heroes[i].Sprite()->DrawCenterBottom(screen, heroesPositions[i] + offset, 0, 1);
 	}
 }