X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.cpp;h=3dea5b4c5f40c9cad6f88ce6055df1d90ae0b84e;hb=51c5ffb4958968827b93624f7849c1b7d3a1eacb;hp=be3c9705d712ee8f03f790c3f2989959b571f237;hpb=fbf5a98f8fd0da951e469003fe87d575a6bb30a4;p=l2e.git

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index be3c970..3dea5b4 100644
--- a/src/battle/BattleState.cpp
+++ b/src/battle/BattleState.cpp
@@ -213,6 +213,16 @@ void BattleState::ResumeState(Application &ctrl, SDL_Surface *screen) {
 		ctrl.PopState(); // quit the battle scene
 		return;
 	}
+	if (Victory()) {
+		// TODO: push victory state
+		ctrl.PopState();
+		return;
+	}
+	if (Defeat()) {
+		// TODO: push defeat state
+		ctrl.PopState();
+		return;
+	}
 	// TODO: this should not push a state while quitting
 	if (AttackSelectionDone()) {
 		ctrl.PushState(new PerformAttacks(this));
@@ -221,6 +231,20 @@ void BattleState::ResumeState(Application &ctrl, SDL_Surface *screen) {
 	}
 }
 
+bool BattleState::Victory() const {
+	for (int i(0); i < MaxMonsters(); ++i) {
+		if (MonsterAt(i).Health() > 0) return false;
+	}
+	return true;
+}
+
+bool BattleState::Defeat() const {
+	for (int i(0); i < NumHeroes(); ++i) {
+		if (HeroAt(i).Health() > 0) return false;
+	}
+	return true;
+}
+
 void BattleState::PauseState(Application &ctrl, SDL_Surface *screen) {
 
 }
@@ -272,16 +296,41 @@ void BattleState::CalculateDamage() {
 		monsterAttacks[CurrentAttack().index].Selection().SetBad(0, 15);
 	} else {
 		TargetSelection &ts(AttackChoiceAt(CurrentAttack().index).Selection());
+		bool hitSome(false);
 		if (ts.TargetsEnemies()) {
 			for (int i(0); i < MaxMonsters(); ++i) {
-				if (ts.IsSelected(i) && MonsterAt(i).Health() > 0) {
+				if (ts.IsSelected(i)) {
+					if (MonsterAt(i).Health() > 0) {
+						ts.SetBad(i, 15);
+						hitSome = true;
+					} else {
+						ts.Unselect(i);
+					}
+				}
+			}
+			if (hitSome) return;
+			for (int i(0); i < MaxMonsters(); ++i) {
+				if (MonsterAt(i).Health() > 0) {
 					ts.SetBad(i, 15);
+					break;
 				}
 			}
 		} else {
 			for (int i(0); i < NumHeroes(); ++i) {
-				if (ts.IsSelected(i) && HeroAt(i).Health() > 0) {
+				if (ts.IsSelected(i)) {
+					if (HeroAt(i).Health() > 0) {
+						ts.SetBad(i, 15);
+						hitSome = true;
+					} else {
+						ts.Unselect(i);
+					}
+				}
+			}
+			if (hitSome) return;
+			for (int i(0); i < NumHeroes(); ++i) {
+				if (HeroAt(i).Health() > 0) {
 					ts.SetBad(i, 15);
+					break;
 				}
 			}
 		}
@@ -300,7 +349,7 @@ void BattleState::ApplyDamage() {
 		}
 	} else {
 		for (int i(0); i < NumHeroes(); ++i) {
-			if (ts.IsSelected(i) && MonsterAt(i).Health() > 0) {
+			if (ts.IsBad(i)) {
 				HeroAt(i).SubtractHealth(ts.GetAmount(i));
 			}
 		}
@@ -345,7 +394,9 @@ void BattleState::RenderBackground(SDL_Surface *screen, const Vector<int> &offse
 
 void BattleState::RenderMonsters(SDL_Surface *screen, const Vector<int> &offset) {
 	for (vector<Monster>::size_type i(0), end(monsters.size()); i < end; ++i) {
-		monsters[i].Sprite()->DrawCenter(screen, monsterPositions[i] + offset);
+		if (MonsterPositionOccupied(i)) {
+			monsters[i].Sprite()->DrawCenter(screen, monsterPositions[i] + offset);
+		}
 	}
 }