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

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index 4e12f79..2c5fe81 100644
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -51,10 +51,21 @@ void BattleState::EnterState(Application &ctrl, SDL_Surface *screen) {
 	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(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::ExitState() {
+void BattleState::PauseState(Application &ctrl, SDL_Surface *screen) {
 
 }
 
@@ -74,7 +85,6 @@ void BattleState::Render(SDL_Surface *screen) {
 	RenderMonsters(screen, offset);
 //	RenderHeroes(screen, offset);
 	RenderHeroTags(screen, offset);
-	RenderAttackTypeMenu(screen, offset);
 }
 
 void BattleState::RenderBackground(SDL_Surface *screen, const Vector<int> &offset) {
@@ -112,15 +122,8 @@ void BattleState::RenderHeroTags(SDL_Surface *screen, const Vector<int> &offset)
 	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);
+		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(
-			(BackgroundWidth() - attackTypeMenu.Width()) / 2,
-			(BackgroundHeight() * 3 / 4) - (attackTypeMenu.Height() / 2));
-	attackTypeMenu.Render(screen, position + offset);
-}
-
 }