X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fsetup.c;h=600afc43dbfb102494c113bb35469bc16249bf55;hp=03d9e794f36a50d7f250dd18c0bd244464e01395;hb=0e9bdbb882f74cad6af644e3e1b530f9ffbf5e8d;hpb=2cae1cd3feb922843b40af851f43f9e08bb18f0d

diff --git a/src/setup.c b/src/setup.c
index 03d9e79..600afc4 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -28,7 +28,7 @@ void freeze(bool boss)
     }
     else {
 	if ((key = scan()) == IHEOL) {
-	    proutn("File name: ");
+	    proutn(_("File name: "));
 	    key = scan();
 	}
 	if (key != IHALPHA) {
@@ -41,7 +41,7 @@ void freeze(bool boss)
 	}
     }
     if ((fp = fopen(citem, "wb")) == NULL) {
-	proutn("Can't freeze game as file ");
+	proutn(_("Can't freeze game as file "));
 	proutn(citem);
 	skip(1);
 	return;
@@ -169,6 +169,8 @@ void abandn(void)
 	    prout("to %s.", systemname(q->planet));
 	} else {
 	    prout("Entire crew of %d left to die in outer space.");
+	    game.casual += game.state.crew;
+	    game.abandoned += game.state.crew;
 	}
 
 	/* If at least one base left, give 'em the Faerie Queene */
@@ -179,11 +181,10 @@ void abandn(void)
 	prout("the Federation in a prisoner-of-war exchange.");
 	nb = Rand()*game.state.rembase+1;
 	/* Set up quadrant and position FQ adjacient to base */
-	if (game.quadrant.x!=game.state.baseq[nb].x || game.quadrant.y!=game.state.baseq[nb].y) {
-	    game.quadrant.x = game.state.baseq[nb].x;
-	    game.quadrant.y = game.state.baseq[nb].y;
+	if (!same(game.quadrant, game.state.baseq[nb])) {
+	    game.quadrant = game.state.baseq[nb];
 	    game.sector.x = game.sector.y = 5;
-	    newqad(1);
+	    newqad(true);
 	}
 	for (;;) {
 	    /* position next to base by trial and error */
@@ -197,16 +198,17 @@ void abandn(void)
 	    if (l < QUADSIZE+1) break; /* found a spot */
 	    game.sector.x=QUADSIZE/2;
 	    game.sector.y=QUADSIZE/2;
-	    newqad(1);
+	    newqad(true);
 	}
     }
     /* Get new commission */
     game.quad[game.sector.x][game.sector.y] = game.ship = IHF;
+    game.state.crew = FULLCREW;
     prout("Starfleet puts you in command of another ship,");
     prout("the Faerie Queene, which is antiquated but,");
     prout("still useable.");
     if (game.icrystl!=0) prout("The dilithium crystals have been moved.");
-    game.imine=0;
+    game.imine = false;
     game.iscraft=0; /* Galileo disappears */
     /* Resupply ship */
     game.condit=IHDOCKED;
@@ -223,15 +225,16 @@ void abandn(void)
     return;
 }
 	
-void setup(int needprompt) 
+void setup(bool needprompt) 
 {
     int i,j, krem, klumper;
     int ix, iy;
     //  Decide how many of everything
     if (choose(needprompt)) return; // frozen game
     // Prepare the Enterprise
-    game.alldone = game.gamewon = 0;
+    game.alldone = game.gamewon = false;
     game.ship = IHE;
+    game.state.crew = FULLCREW;
     game.energy = game.inenrg = 5000.0;
     game.shield = game.inshld = 2500.0;
     game.shldchg = 0;
@@ -249,9 +252,9 @@ void setup(int needprompt)
     // Set up assorted game parameters
     game.battle.x = game.battle.y = 0;
     game.state.date = game.indate = 100.0*(int)(31.0*Rand()+20.0);
-    game.nkinks = game.nhelp = game.casual = 0;
-    game.resting = false;
-    game.isatb = game.iscate = game.imine = game.icrystl = game.icraft = game.state.nplankl = 0;
+    game.nkinks = game.nhelp = game.casual = game.abandoned = 0;
+    game.resting = game.imine = false;
+    game.isatb = game.iscate = game.icrystl = game.icraft = game.state.nplankl = 0;
     game.state.starkl = game.state.basekl = 0;
     game.iscraft = 1;
     game.landed = -1;
@@ -446,7 +449,7 @@ void setup(int needprompt)
     prout("Good Luck!");
     if (game.state.nscrem) prout("  YOU'LL NEED IT.");
     waitfor();
-    newqad(0);
+    newqad(false);
     if (game.nenhere-iqhere-game.ithere) game.shldup = true;
     if (game.neutz) attack(0);	// bad luck to start in a Romulan Neutral Zone
 }
@@ -588,7 +591,7 @@ void newkling(int i, coord *pi)
     game.kpower[i] = Rand()*150.0 +300.0 +25.0*game.skill;
 }
 
-void newqad(int shutup) 
+void newqad(bool shutup) 
 {
     int i, j;
     coord w;
@@ -786,3 +789,20 @@ void sortkl(void)
 	    }
     } while (sw);
 }
+
+void setpassword(void) 
+{
+    if (!(game.options & OPTION_CURSES)) {
+	while (TRUE) {
+	    scan();
+	    strcpy(game.passwd, citem);
+	    chew();
+	    if (*game.passwd != 0) break;
+	    proutn(_("Please type in a secret password-"));
+	}
+    } else {
+	int i;
+        for(i=0;i<3;i++) game.passwd[i]=(char)(97+(int)(Rand()*25));
+        game.passwd[3]=0;
+    }
+}