From 42fb77b53b61b3e132da62f3f45507ad3885b9d2 Mon Sep 17 00:00:00 2001
From: Steve <stephenjsweeney@battleforthesolarsystem.com>
Date: Sat, 30 Apr 2016 17:22:38 +0100
Subject: [PATCH] STAT_MISSILES_EVADED update.

---
 src/battle/bullets.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/battle/bullets.c b/src/battle/bullets.c
index cd53862..71f8760 100644
--- a/src/battle/bullets.c
+++ b/src/battle/bullets.c
@@ -108,11 +108,6 @@ void doBullets(void)
 
 		if (--b->life <= 0)
 		{
-			if (player != NULL && player->alive == ALIVE_ALIVE && b->type == BT_MISSILE && b->damage > 0 && b->target == player)
-			{
-				battle.stats[STAT_MISSILES_EVADED]++;
-			}
-
 			if (b == battle.bulletTail)
 			{
 				battle.bulletTail = prev;
@@ -206,7 +201,13 @@ static void checkCollisions(Bullet *b)
 						battle.stats[STAT_MISSILES_STRUCK]++;
 					}
 				}
-
+				
+				/* missile was targetting player, but hit something else */
+				if (b->type == BT_MISSILE && b->target == player && e != player)
+				{
+					battle.stats[STAT_MISSILES_EVADED]++;
+				}
+				
 				/* assuming that health <= 0 will always mean killed */
 				if (e->health <= 0)
 				{
@@ -318,6 +319,8 @@ static void huntTarget(Bullet *b)
 			b->life = 0;
 			addMissileExplosion(b);
 			playBattleSound(SND_EXPLOSION_1, b->x, b->y);
+			
+			battle.stats[STAT_MISSILES_EVADED]++;
 		}
 	}
 	else