X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.cpp;h=5547bbf8235822c64bf6d6ca6ecb49ba98df9af4;hb=4c3d420d8fc933d334def034f5d76ba23934479d;hp=95f2f118d9e618f45b928180bad1698240b0969d;hpb=d4609ba1798d82cce128b5985d60cb212b760246;p=l2e.git

diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp
index 95f2f11..5547bbf 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;
@@ -376,9 +375,13 @@ void BattleState::ApplyDamage() {
 	TargetSelection &ts(ac.Selection());
 	if (ts.TargetsEnemies()) {
 		for (int i(0); i < MaxMonsters(); ++i) {
+			Monster &monster(MonsterAt(i));
 			if (ts.IsBad(i)) {
-				MonsterAt(i).SubtractHealth(ts.GetAmount(i));
-				// TODO: collect reward if dead
+				monster.SubtractHealth(ts.GetAmount(i));
+				if (monster.Health() == 0) {
+					expReward += monster.ExpReward();
+					goldReward += monster.GoldReward();
+				}
 			}
 		}
 	} else {