X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Ffinish.c;h=95c7d974a22a52a6f2ab538e108ed3b4c926c6b4;hp=c9e83335b56e4e0f0068af62af0a35ecab1dfdd9;hb=c0682ebb9ae828d035d59892a65e1849d85963b7;hpb=8700dc6a521fe201815aad02cf05f7f4c297c305

diff --git a/src/finish.c b/src/finish.c
index c9e8333..95c7d97 100644
--- a/src/finish.c
+++ b/src/finish.c
@@ -2,11 +2,12 @@
 #include <string.h>
 #include <time.h>
 
-void dstrct() 
+void selfdestruct(void)
+/* self-destruct maneuver */
 {
     /* Finish with a BANG! */
     chew();
-    if (game.damage[DCOMPTR] != 0.0) {
+    if (damaged(DCOMPTR)) {
 	prout(_("Computer damaged; cannot execute destruct sequence."));
 	return;
     }
@@ -61,7 +62,7 @@ void kaboom(void)
 	int l=1;
 	while (l <= game.nenhere) {
 	    if (game.kpower[l]*game.kdist[l] <= whammo) 
-		deadkl(game.kx[l],game.ky[l], game.quad[game.kx[l]][game.ky[l]], game.kx[l], game.ky[l]);
+		deadkl(game.ks[l], game.quad[game.ks[l].x][game.ks[l].y], game.ks[l]);
 	    l++;
 	}
     }
@@ -69,10 +70,11 @@ void kaboom(void)
 }
 				
 
-void finish(FINTYPE ifin) 
+void finish(FINTYPE ifin)
+/* end the game, with appropriate notfications */
 {
-    int igotit = 0;
-    game.alldone = 1;
+    bool igotit = false;
+    game.alldone = true;
     skip(3);
     prout(_("It is stardate %.1f."), game.state.date);
     skip(1);
@@ -84,11 +86,11 @@ void finish(FINTYPE ifin)
 
 	prout(_("You have smashed the Klingon invasion fleet and saved"));
 	prout(_("the Federation."));
-	game.gamewon=1;
+	game.gamewon = true;
 	if (game.alive) {
 	    double badpt;
 	    badpt = 5.0*game.state.starkl + game.casual + 10.0*game.state.nplankl +
-		45.*game.nhelp+100.*game.state.basekl;
+		45.*game.nhelp+100.*game.state.basekl+3.*game.abandoned;
 	    if (game.ship == IHF) badpt += 100.0;
 	    else if (game.ship == 0) badpt += 200.0;
 	    if (badpt < 100.0) badpt = 0.0;	// Close enough!
@@ -134,17 +136,13 @@ void finish(FINTYPE ifin)
 		    break;
 		}
 		if (game.skill >= SKILL_EXPERT) {
-		    if (game.thawed
-#ifdef DEBUG
-			&& !game.idebug
-#endif
-			)
+		    if (game.thawed && !idebug)
 			prout(_("You cannot get a citation, so..."));
 		    else {
 			proutn(_("Do you want your Commodore Emeritus Citation printed? "));
 			chew();
-			if (ja()) {
-			    igotit = 1;
+			if (ja() == true) {
+			    igotit = true;
 			}
 		    }
 		}
@@ -154,7 +152,7 @@ void finish(FINTYPE ifin)
 	    prout(_("LIVE LONG AND PROSPER."));
 	}
 	score();
-	if (igotit != 0) plaque();
+	if (igotit) plaque();
 	return;
     case FDEPLETE: // Federation Resources Depleted
 	prout(_("Your time has run out and the Federation has been"));
@@ -282,6 +280,9 @@ void finish(FINTYPE ifin)
 	prout(_("Your ship is drawn to the center of the black hole."));
 	prout(_("You are crushed into extremely dense matter."));
 	break;
+    case FCREW:
+	prout(_("Your last crew member has died."));
+	break;
     }
     if (game.ship==IHF) game.ship= 0;
     else if (game.ship == IHE) game.ship = IHF;
@@ -314,6 +315,7 @@ void finish(FINTYPE ifin)
 }
 
 void score(void) 
+/* compute player's score */
 {
     double timused = game.state.date - game.indate;
     int ithperd, iwon, klship;
@@ -330,7 +332,7 @@ void score(void)
     if (game.gamewon == 0) game.state.nromrem = 0; // None captured if no win
     iscore = 10*NKILLK + 50*NKILLC + ithperd + iwon
 	- 100*game.state.basekl - 100*klship - 45*game.nhelp -5*game.state.starkl - game.casual
-	+ 20*NKILLROM + 200*NKILLSC - 10*game.state.nplankl + game.state.nromrem;
+	+ 20*NKILLROM + 200*NKILLSC - 10*game.state.nplankl - 300*game.state.nworldkl + game.state.nromrem;
     if (game.alive == 0) iscore -= 200;
     skip(2);
     prout(_("Your score --"));
@@ -358,6 +360,9 @@ void score(void)
     if (game.state.nplankl)
 	prout(_("%6d planets destroyed by your action   %5d"),
 	      game.state.nplankl, -10*game.state.nplankl);
+    if ((game.options & OPTION_WORLDS) && game.state.nworldkl)
+	prout(_("%6d inhabited planets destroyed by your action   %5d"),
+	      game.state.nplankl, -300*game.state.nworldkl);
     if (game.state.basekl)
 	prout(_("%6d bases destroyed by your action     %5d"),
 	      game.state.basekl, -100*game.state.basekl);
@@ -367,6 +372,9 @@ void score(void)
     if (game.casual)
 	prout(_("%6d casualties incurred                %5d"),
 	      game.casual, -game.casual);
+    if (game.abandoned)
+	prout(_("%6d crew abandoned in space            %5d"),
+	      game.abandoned, -3*game.abandoned);
     if (klship)
 	prout(_("%6d ship(s) lost or destroyed          %5d"),
 	      klship, -100*klship);
@@ -387,7 +395,9 @@ void score(void)
     prout(_("TOTAL SCORE                               %5d"), iscore);
 }
 
-void plaque(void) {
+void plaque(void)
+/* emit winner's commemmorative plaque */
+{
 	FILE *fp=NULL;
 	time_t t;
 	char *timestring;