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

diff --git a/src/setup.c b/src/setup.c
index 812a6c1..600afc4 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -181,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 */
@@ -199,7 +198,7 @@ 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 */
@@ -209,7 +208,7 @@ void abandn(void)
     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;
@@ -226,14 +225,14 @@ 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;
@@ -254,8 +253,8 @@ void setup(int needprompt)
     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 = game.abandoned = 0;
-    game.resting = false;
-    game.isatb = game.iscate = game.imine = game.icrystl = game.icraft = game.state.nplankl = 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;
@@ -450,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
 }
@@ -592,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;