X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Ffinish.c;h=78680d871953b89d5ef573e3ad17db178d30998a;hp=e1914514bc05b1f65ca2d569b3e9cda9bbac9fdd;hb=2cae1cd3feb922843b40af851f43f9e08bb18f0d;hpb=c8f91a7e3437017d237a3bad0166054b97206d8d

diff --git a/src/finish.c b/src/finish.c
index e191451..78680d8 100644
--- a/src/finish.c
+++ b/src/finish.c
@@ -6,7 +6,7 @@ void dstrct()
 {
     /* Finish with a BANG! */
     chew();
-    if (game.damage[DCOMPTR] != 0.0) {
+    if (damaged(DCOMPTR)) {
 	prout(_("Computer damaged; cannot execute destruct sequence."));
 	return;
     }
@@ -71,8 +71,8 @@ void kaboom(void)
 
 void finish(FINTYPE ifin) 
 {
-    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,7 +84,7 @@ 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 +
@@ -134,11 +134,7 @@ 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? "));
@@ -330,7 +326,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 +354,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);