X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.cpp;h=84d1a497240da814a105eb64301889b412c7650e;hb=1c5b28e8559e8383958307534e262a9b29f50fdf;hp=d0bb108da3a65256ce0b9846a8eb6557cc663364;hpb=7263bddbde91d555decd58f043f6b43f54ba2b00;p=l2e.git

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index d0bb108..84d1a49 100644
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -211,7 +211,6 @@ void BattleState::ExitState(Application &ctrl, SDL_Surface *screen) {
 }
 
 void BattleState::ResumeState(Application &ctrl, SDL_Surface *screen) {
-	// TODO: check for victory or defeat
 	if (ranAway) {
 		ctrl.PopState(); // quit the battle scene
 		return;
@@ -390,6 +389,14 @@ void BattleState::ApplyDamage() {
 	}
 }
 
+AttackChoice &BattleState::CurrentAttackAttackChoice() {
+	if (CurrentAttack().isMonster) {
+		return monsterAttacks[CurrentAttack().index];
+	} else {
+		return AttackChoiceAt(CurrentAttack().index);
+	}
+}
+
 void BattleState::ClearAllAttacks() {
 	attackCursor = -1;
 	activeHero = -1;