From: limb <limb@bc5cbbab-a4ec-0310-bb52-ff3d296db539>
Date: Thu, 4 Jun 2009 17:46:24 +0000 (+0000)
Subject: Scoring is more in line with risk.
X-Git-Tag: 1.01~29
X-Git-Url: http://git.pulsar-zone.net/?a=commitdiff_plain;h=9098f6fda7b1988ec6c177f1919aa77145ef7a99;p=curblaster.git

Scoring is more in line with risk.
Game ends after level 24 is completed.


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

diff --git a/main.cpp b/main.cpp
index e337849..83cd598 100644
--- a/main.cpp
+++ b/main.cpp
@@ -864,17 +864,7 @@ int main(int argc, char *argv[]){
     char quit = getch();
     if(quit=='y'){
       printw("\nBye Bye!\n");
-      loopvar=1;
-       if(sound==1){
-         Mix_FreeChunk(shotsound);
-         Mix_FreeChunk(boomsound);
-         Mix_FreeChunk(dropoffsound);
-         Mix_FreeChunk(pickupsound);
-         Mix_FreeChunk(lasersound);
-         Mix_FreeChunk(warningsound);
-         Mix_CloseAudio();
-         SDL_Quit();
-      };
+      loopvar=1;       
     };
     halfdelay(1);
     };
@@ -994,7 +984,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]);
-	    score = score + 10;
+	    score = score + 15;
 	  };
 	};
 	//kill crazies
@@ -1003,7 +993,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]);
-	    score = score + 10;
+	    score = score + 15;
 	  };
 	};
 	//kill crawlers
@@ -1012,7 +1002,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]);
-	    score = score + 10;
+	    score = score + 15;
 	  };
 	};
 	//hurt/kill boss
@@ -1024,7 +1014,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]);
-	        score = score + 100;
+	        score = score + 75;
 	      };
             };
 	  };
@@ -1092,21 +1082,21 @@ 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]);
-	  score = score + 20;
+	  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 + 20;
+	  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 + 20;
+	  score = score + 5;
 	};
       };
       for(int bossloop = 0; bossloop<6; bossloop++){
@@ -1116,7 +1106,7 @@ int main(int argc, char *argv[]){
 	    if(bosses[bossloop].phase<=0){
 	      boom_object(boomstuff, bosses[bossloop], boomsound, boomchannel);
 	      bosses[bossloop] = object_out(bosses[bossloop]);
-	      score = score + 100;
+	      score = score + 50;
 	    };
 	  };
         };
@@ -1211,7 +1201,7 @@ int main(int argc, char *argv[]){
 	  landers[landerloop] = object_out(landers[landerloop]);
 	  lives--;
 	  //add to score
-	  score = score + 20;
+	  score = score + 10;
 	  boom_object(boomstuff, player, boomsound, boomchannel);
 	  life_loss(lives, score);
 	  player = player_init(player);
@@ -1233,7 +1223,7 @@ int main(int argc, char *argv[]){
 	    if(check_collision(landers[landerloop], shields[shieldloop])==1){
 	      boom_object(boomstuff, landers[landerloop], boomsound, boomchannel);
 	      landers[landerloop] = object_out(landers[landerloop]);
-	      score = score + 20;
+	      score = score + 10;
 	    };
 	  };
 	};
@@ -1248,7 +1238,7 @@ int main(int argc, char *argv[]){
 	  crazies[crazyloop] = object_out(crazies[crazyloop]);
 	  lives--;
 	  //add to score
-	  score = score + 20;
+	  score = score + 10;
 	  boom_object(boomstuff, player, boomsound, boomchannel);
 	  life_loss(lives, score);
 	  player = player_init(player);
@@ -1270,7 +1260,7 @@ int main(int argc, char *argv[]){
 	    if(check_collision(crazies[crazyloop], shields[shieldloop])==1){
 	      boom_object(boomstuff, crazies[crazyloop], boomsound, boomchannel);
 	      crazies[crazyloop] = object_out(crazies[crazyloop]);
-	      score = score + 20;
+	      score = score + 10;
 	    };
 	  };
 	};
@@ -1285,7 +1275,7 @@ int main(int argc, char *argv[]){
 	  crawlers[crawlerloop] = object_out(crawlers[crawlerloop]);
 	  lives--;
 	  //add to score
-	  score = score + 20;
+	  score = score + 10;
 	  boom_object(boomstuff, player, boomsound, boomchannel);
 	  life_loss(lives, score);
 	  player = player_init(player);
@@ -1307,7 +1297,7 @@ int main(int argc, char *argv[]){
 	    if(check_collision(crawlers[crawlerloop], shields[shieldloop])==1){
 	      boom_object(boomstuff, crawlers[crawlerloop], boomsound, boomchannel);
 	      crawlers[crawlerloop] = object_out(crawlers[crawlerloop]);
-	      score = score + 20;
+	      score = score + 10;
 	    };
 	  };
 	};
@@ -1563,6 +1553,15 @@ int main(int argc, char *argv[]){
 	    mvprintw(10,20,"Level %d Completed.  Press SPACE to continue.\n", level);
 	    pause_game = getch();
 	  };
+	  if(level==24){
+	    pause_game = 'f';
+	    while(pause_game!=' '){
+	      mvprintw(11,21,"Victory!!!! Score: %d Press SPACE to exit\n", score);
+	      pause_game = getch();
+	      loopvar = 1;
+            };
+	  };
+
 	  halfdelay(1);
 	  //Advance level
 	  level++;
@@ -1628,6 +1627,17 @@ int main(int argc, char *argv[]){
     };
     
   }; //end main loop
+
+  if(sound==1){
+    Mix_FreeChunk(shotsound);
+    Mix_FreeChunk(boomsound);
+    Mix_FreeChunk(dropoffsound);
+    Mix_FreeChunk(pickupsound);
+    Mix_FreeChunk(lasersound);
+    Mix_FreeChunk(warningsound);
+    Mix_CloseAudio();
+    SDL_Quit();
+  };
   
   endwin();