From 9f993f2710e68dcdce3bfc20837bda9b717d6c8e Mon Sep 17 00:00:00 2001
From: limb <limb@bc5cbbab-a4ec-0310-bb52-ff3d296db539>
Date: Sat, 18 Jul 2009 04:10:46 +0000
Subject: [PATCH] Shot handling fixes, optimizations.

git-svn-id: svn+ssh://svn/var/repos/curfender@845 bc5cbbab-a4ec-0310-bb52-ff3d296db539
---
 age_bullet.cpp |  2 +-
 main.cpp       | 30 ++++++++----------------------
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/age_bullet.cpp b/age_bullet.cpp
index 0225ff7..aa05ac5 100644
--- a/age_bullet.cpp
+++ b/age_bullet.cpp
@@ -7,7 +7,7 @@ game_object age_bullet(game_object object){
     object.y = 0;
     object.speed = 0;
     object.direction = 0;
-    object.vtime = 0;
+    object.vtime = 1;
   } else {
     object.vtime++;
   };
diff --git a/main.cpp b/main.cpp
index 6dafe17..6ca0a98 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1103,7 +1103,7 @@ int main(int argc, char *argv[]){
       } else {
         //shot sound
         if(sound==1){shotchannel = play_sound_effect(shotsound);};
-	//get next inactive bullet, give it player's direction, speed, height, location +speed in direction, active, set vtime=1.
+	//get next inactive bullet, give it player's direction, speed, height, location +speed in direction, active.
 	for(int bulletloop = 0; bulletloop<bulletmax; bulletloop++){ 
 	  if(bullets[bulletloop].active==0){ 
 	    bullets[bulletloop].active=1;
@@ -1114,7 +1114,6 @@ int main(int argc, char *argv[]){
 	    int multiplier = 1;
 	    if(player.direction == 4){multiplier = -1; };
 	    bullets[bulletloop].y = player.y + (player.speed * multiplier);
-	    bullets[bulletloop].vtime = 1;
 	    break;
 	  };
 	};
@@ -1129,7 +1128,6 @@ int main(int argc, char *argv[]){
 	      int multiplier = 1;
 	      if(player.direction == 4){multiplier = -1; };
 	      bullets[bulletloop].y = player.y + (player.speed * multiplier);
-	    bullets[bulletloop].vtime = 1;
 	    tripshot--;
 	    break;
 	    };
@@ -1144,7 +1142,6 @@ int main(int argc, char *argv[]){
 	      int multiplier = 1;
 	      if(player.direction == 4){multiplier = -1; };
 	      bullets[bulletloop].y = player.y + (player.speed * multiplier);
-	      bullets[bulletloop].vtime = 1;
 	      tripshot--;
 	      break;
 	    };
@@ -1208,8 +1205,7 @@ int main(int argc, char *argv[]){
       	    if(check_collision(bullets[bulletloop], pods[podloop])==1){
 	      //kill pod and bullet
 	      pods[podloop] = object_out(pods[podloop]);
-	      bullets[bulletloop].vtime = 100;
-	      bullets[bulletloop] = age_bullet(bullets[bulletloop]);
+	      bullets[bulletloop] = object_out(bullets[bulletloop]);
 	    };
 	  };
 	};
@@ -1221,8 +1217,7 @@ int main(int argc, char *argv[]){
       	      determine_powerup(powerups, landers[landerloop], 800, pupcreatesound, pupcreatechannel);
 	      boom_object(boomstuff, landers[landerloop], boomsound, boomchannel);
 	      landers[landerloop] = object_out(landers[landerloop]);
-	      bullets[bulletloop].vtime = 100;
-	      bullets[bulletloop] = age_bullet(bullets[bulletloop]);
+	      bullets[bulletloop] = object_out(bullets[bulletloop]);
 	      //add to score
 	      score = score + 20;
 	    };
@@ -1236,8 +1231,7 @@ int main(int argc, char *argv[]){
       	      determine_powerup(powerups, crazies[crazyloop], 800, pupcreatesound, pupcreatechannel);	      
 	      boom_object(boomstuff, crazies[crazyloop], boomsound, boomchannel);
 	      crazies[crazyloop] = object_out(crazies[crazyloop]);
-	      bullets[bulletloop].vtime = 100;
-	      bullets[bulletloop] = age_bullet(bullets[bulletloop]);
+	      bullets[bulletloop] = object_out(bullets[bulletloop]);
 	      //add to score
 	      score = score + 20;
 	    };
@@ -1251,8 +1245,7 @@ int main(int argc, char *argv[]){
       	      determine_powerup(powerups, crawlers[crawlerloop], 800, pupcreatesound, pupcreatechannel);
 	      boom_object(boomstuff, crawlers[crawlerloop], boomsound, boomchannel);
 	      crawlers[crawlerloop] = object_out(crawlers[crawlerloop]);
-	      bullets[bulletloop].vtime = 100;
-	      bullets[bulletloop] = age_bullet(bullets[bulletloop]);
+	      bullets[bulletloop] = object_out(bullets[bulletloop]);
 	      //add to score
 	      score = score + 20;
 	    };
@@ -1268,8 +1261,7 @@ int main(int argc, char *argv[]){
 	        determine_powerup(powerups, bosses[bossloop], 600, pupcreatesound, pupcreatechannel);
 	        boom_object(boomstuff, bosses[bossloop], boomsound, boomchannel);
 	        bosses[bossloop] = object_out(bosses[bossloop]);
-	        bullets[bulletloop].vtime = 100;
-	        bullets[bulletloop] = age_bullet(bullets[bulletloop]);
+	        bullets[bulletloop] = object_out(bullets[bulletloop]);
 	        //add to score
 	        score = score + 100;
 	      };
@@ -1454,7 +1446,6 @@ int main(int argc, char *argv[]){
 	      landershot[landershotloop].speed = landers[landerloop].speed;
 	      landershot[landershotloop].x = landers[landerloop].x;
 	      landershot[landershotloop].y = landers[landerloop].y + (landers[landerloop].speed * multiplier);
-	      landershot[landershotloop].vtime = 1;
 	      break;
 	    };
 	  };
@@ -1488,7 +1479,6 @@ int main(int argc, char *argv[]){
 	      landershot[crazyshotloop].speed = crazies[crazyloop].speed;
 	      landershot[crazyshotloop].x = crazies[crazyloop].x;
 	      landershot[crazyshotloop].y = crazies[crazyloop].y + (crazies[crazyloop].speed * multiplier);
-	      landershot[crazyshotloop].vtime = 1;
 	      break;
 	    };
 	  };
@@ -1522,7 +1512,6 @@ int main(int argc, char *argv[]){
 	      landershot[crawlershotloop].speed = crawlers[crawlerloop].speed;
 	      landershot[crawlershotloop].x = crawlers[crawlerloop].x;
 	      landershot[crawlershotloop].y = crawlers[crawlerloop].y + (crawlers[crawlerloop].speed * multiplier);
-	      landershot[crawlershotloop].vtime = 1;
 	      break;
 	    };
 	  };
@@ -1556,7 +1545,6 @@ int main(int argc, char *argv[]){
 	      landershot[bossshotloop].speed = bosses[bossloop].speed;
 	      landershot[bossshotloop].x = bosses[bossloop].x;
 	      landershot[bossshotloop].y = bosses[bossloop].y + (bosses[bossloop].speed * multiplier);
-	      landershot[bossshotloop].vtime = 1;
 	      break;
 	    };
 	  };
@@ -1570,8 +1558,7 @@ int main(int argc, char *argv[]){
 	if(check_collision(landershot[landershotloop], player)==1){
 	  //kill landershot and player
 	  lives--;
-	  landershot[landershotloop].vtime = 100;
-	  landershot[landershotloop] = age_bullet(landershot[landershotloop]);  
+	  landershot[landershotloop] = object_out(landershot[landershotloop]);  
 	  boom_object(boomstuff, player, boomsound, boomchannel);
 	  life_loss(lives, score);
 	  player = player_init(player);
@@ -1591,8 +1578,7 @@ int main(int argc, char *argv[]){
 	if(shieldup==1){
 	  for(int shieldloop = 0; shieldloop<12; shieldloop++){
 	    if(check_collision(landershot[landershotloop], shields[shieldloop])==1){
-	      landershot[landershotloop].vtime = 100;
-	      landershot[landershotloop] = age_bullet(landershot[landershotloop]);
+	      landershot[landershotloop] = object_out(landershot[landershotloop]);
 	    };
 	  };
 	};
-- 
2.9.0