From: limb <limb@bc5cbbab-a4ec-0310-bb52-ff3d296db539>
Date: Sat, 13 Jun 2009 03:08:28 +0000 (+0000)
Subject: Definite smartbomb wrap fix, probable laser wrap fix.
X-Git-Tag: 1.01~18
X-Git-Url: http://git.pulsar-zone.net/?a=commitdiff_plain;h=b84cbf7d95cd23a4099e09ff3b6e13a6c8bf8ce1;p=curblaster.git

Definite smartbomb wrap fix, probable laser wrap fix.


git-svn-id: svn+ssh://svn/var/repos/curfender@836 bc5cbbab-a4ec-0310-bb52-ff3d296db539
---

diff --git a/main.cpp b/main.cpp
index cbeca11..0784cef 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1046,7 +1046,7 @@ int main(int argc, char *argv[]){
 	laserchannel = play_sound_effect(lasersound);	    
 	//kill landers
 	for(int landerloop = 0; landerloop<landermax; landerloop++){
-	  if((abs(player.y-landers[landerloop].y)<=80)&&(player.x==landers[landerloop].x)&&((player.face==0&&(landers[landerloop].y<player.y))||(player.face==1&&(landers[landerloop].y>player.y)))){
+	  if(((abs(player.y-landers[landerloop].y)<=80)||(abs(player.y-landers[landerloop].y)>=540))&&(player.x==landers[landerloop].x)&&((player.face==0&&(landers[landerloop].y<player.y))||(player.face==1&&(landers[landerloop].y>player.y)))){
 	    determine_powerup(powerups, landers[landerloop], 800, pupcreatesound, pupcreatechannel);
 	    boom_object(boomstuff, landers[landerloop], boomsound, boomchannel);
 	    landers[landerloop] = object_out(landers[landerloop]);
@@ -1055,7 +1055,7 @@ int main(int argc, char *argv[]){
 	};
 	//kill crazies
 	for(int crazyloop = 0; crazyloop<landermax; crazyloop++){
-	  if((abs(player.y-crazies[crazyloop].y)<=80)&&(player.x==crazies[crazyloop].x)&&((player.face==0&&(crazies[crazyloop].y<player.y))||(player.face==1&&(crazies[crazyloop].y>player.y)))){
+	  if(((abs(player.y-crazies[crazyloop].y)<=80)||(abs(player.y-crazies[crazyloop].y)>=540))&&(player.x==crazies[crazyloop].x)&&((player.face==0&&(crazies[crazyloop].y<player.y))||(player.face==1&&(crazies[crazyloop].y>player.y)))){
 	    determine_powerup(powerups, crazies[crazyloop], 800, pupcreatesound, pupcreatechannel);
 	    boom_object(boomstuff, crazies[crazyloop], boomsound, boomchannel);	    
 	    crazies[crazyloop] = object_out(crazies[crazyloop]);
@@ -1064,7 +1064,7 @@ int main(int argc, char *argv[]){
 	};
 	//kill crawlers
 	for(int crawlerloop = 0; crawlerloop<crawlermax; crawlerloop++){
-	  if((abs(player.y-crawlers[crawlerloop].y)<=80)&&(player.x==crawlers[crawlerloop].x)&&((player.face==0&&(crawlers[crawlerloop].y<player.y))||(player.face==1&&(crawlers[crawlerloop].y>player.y)))){
+	  if(((abs(player.y-crawlers[crawlerloop].y)<=80)||(abs(player.y-crawlers[crawlerloop].y)>=540))&&(player.x==crawlers[crawlerloop].x)&&((player.face==0&&(crawlers[crawlerloop].y<player.y))||(player.face==1&&(crawlers[crawlerloop].y>player.y)))){
 	    determine_powerup(powerups, crawlers[crawlerloop], 800, pupcreatesound, pupcreatechannel);
 	    boom_object(boomstuff, crawlers[crawlerloop], boomsound, boomchannel);
 	    crawlers[crawlerloop] = object_out(crawlers[crawlerloop]);
@@ -1074,7 +1074,7 @@ int main(int argc, char *argv[]){
 	//hurt/kill boss
 	for(int bossloop = 0; bossloop<6; bossloop++){
 	  if(bosses[bossloop].active==1){
-	    if((abs(player.y-bosses[bossloop].y)<=80)&&(player.x==bosses[bossloop].x)&&((player.face==0&&(bosses[bossloop].y<player.y))||(player.face==1&&(bosses[bossloop].y>player.y)))){
+	    if(((abs(player.y-bosses[bossloop].y)<=80)||(abs(player.y-bosses[bossloop].y)>=540))&&(player.x==bosses[bossloop].x)&&((player.face==0&&(bosses[bossloop].y<player.y))||(player.face==1&&(bosses[bossloop].y>player.y)))){
 	      bosses[bossloop].phase = bosses[bossloop].phase - 5;
 	      if(bosses[bossloop].phase<=0){
 	        determine_powerup(powerups, bosses[bossloop], 600, pupcreatesound, pupcreatechannel);
@@ -1145,7 +1145,7 @@ int main(int argc, char *argv[]){
       smartbombs--;
       for(int landerloop = 0; landerloop<landermax; landerloop++){
         if(landers[landerloop].active==1){
-	  if(abs(player.y-landers[landerloop].y)<=40){
+	  if((abs(player.y-landers[landerloop].y)<=40)||(abs(player.y-landers[landerloop].y)>=580)){
 	    determine_powerup(powerups, landers[landerloop], 800, pupcreatesound, pupcreatechannel);
 	    boom_object(boomstuff, landers[landerloop], boomsound, boomchannel);
 	    landers[landerloop] = object_out(landers[landerloop]);
@@ -1155,7 +1155,7 @@ int main(int argc, char *argv[]){
       };
       for(int crazyloop = 0; crazyloop<landermax; crazyloop++){
         if(crazies[crazyloop].active==1){
-	  if(abs(player.y-crazies[crazyloop].y)<=40){
+	  if((abs(player.y-crazies[crazyloop].y)<=40)||(abs(player.y-crazies[crazyloop].y)>=580)){
 	    boom_object(boomstuff, crazies[crazyloop], boomsound, boomchannel);
 	    crazies[crazyloop] = object_out(crazies[crazyloop]);
 	    score = score + 5;
@@ -1164,7 +1164,7 @@ int main(int argc, char *argv[]){
       };
       for(int crawlerloop = 0; crawlerloop<crawlermax; crawlerloop++){
         if(crawlers[crawlerloop].active==1){
-	  if(abs(player.y-crawlers[crawlerloop].y)<=40){
+	  if((abs(player.y-crawlers[crawlerloop].y)<=40)||(abs(player.y-crawlers[crawlerloop].y)>=580)){
 	    boom_object(boomstuff, crawlers[crawlerloop], boomsound, boomchannel);
 	    crawlers[crawlerloop] = object_out(crawlers[crawlerloop]);
 	    score = score + 5;
@@ -1173,7 +1173,7 @@ int main(int argc, char *argv[]){
       };
       for(int bossloop = 0; bossloop<6; bossloop++){
         if(bosses[bossloop].active==1){
-	  if(abs(player.y-bosses[bossloop].y)<=40){
+	  if((abs(player.y-bosses[bossloop].y)<=40)||(abs(player.y-bosses[bossloop].y)>=580)){
 	    bosses[bossloop].phase = bosses[bossloop].phase - 5;
 	    if(bosses[bossloop].phase<=0){
 	      boom_object(boomstuff, bosses[bossloop], boomsound, boomchannel);