From 1bfe9cee3ce8029037fbdfbe22863ba82a4e3a18 Mon Sep 17 00:00:00 2001
From: limb <limb@bc5cbbab-a4ec-0310-bb52-ff3d296db539>
Date: Sat, 13 Jun 2009 02:13:08 +0000
Subject: [PATCH] Smartbomb now only kills dead things.

git-svn-id: svn+ssh://svn/var/repos/curfender@834 bc5cbbab-a4ec-0310-bb52-ff3d296db539
---
 main.cpp | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/main.cpp b/main.cpp
index 12d69f9..932c84c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1144,26 +1144,32 @@ int main(int argc, char *argv[]){
     if(input=='a'&&smartbombs>=1){
       smartbombs--;
       for(int landerloop = 0; landerloop<landermax; landerloop++){
-	if(abs(player.y-landers[landerloop].y)<=40){
-	  determine_powerup(powerups, landers[landerloop], 800, pupcreatesound, pupcreatechannel);
-	  boom_object(boomstuff, landers[landerloop], boomsound, boomchannel);
-	  landers[landerloop] = object_out(landers[landerloop]);
-	  score = score + 5;
-	};
+        if(landers[landerloop].active==1){
+	  if(abs(player.y-landers[landerloop].y)<=40){
+	    determine_powerup(powerups, landers[landerloop], 800, pupcreatesound, pupcreatechannel);
+	    boom_object(boomstuff, landers[landerloop], boomsound, boomchannel);
+	    landers[landerloop] = object_out(landers[landerloop]);
+	    score = score + 5;
+	  };
+        };
       };
       for(int crazyloop = 0; crazyloop<landermax; crazyloop++){
-	if(abs(player.y-crazies[crazyloop].y)<=40){
-	  boom_object(boomstuff, crazies[crazyloop], boomsound, boomchannel);
-	  crazies[crazyloop] = object_out(crazies[crazyloop]);
-	  score = score + 5;
-	};
+        if(crazies[crazyloop].active==1){
+	  if(abs(player.y-crazies[crazyloop].y)<=40){
+	    boom_object(boomstuff, crazies[crazyloop], boomsound, boomchannel);
+	    crazies[crazyloop] = object_out(crazies[crazyloop]);
+	    score = score + 5;
+	  };
+        };
       };
       for(int crawlerloop = 0; crawlerloop<crawlermax; crawlerloop++){
-	if(abs(player.y-crawlers[crawlerloop].y)<=40){
-	  boom_object(boomstuff, crawlers[crawlerloop], boomsound, boomchannel);
-	  crawlers[crawlerloop] = object_out(crawlers[crawlerloop]);
-	  score = score + 5;
-	};
+        if(crawlers[crawlerloop].active==1){
+	  if(abs(player.y-crawlers[crawlerloop].y)<=40){
+	    boom_object(boomstuff, crawlers[crawlerloop], boomsound, boomchannel);
+	    crawlers[crawlerloop] = object_out(crawlers[crawlerloop]);
+	    score = score + 5;
+	  };
+        };
       };
       for(int bossloop = 0; bossloop<6; bossloop++){
         if(bosses[bossloop].active==1){
-- 
2.9.0