X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fsetup.c;h=741f35f00016b627ab1fef2bed17e75f6d0364fd;hp=06ff22ac3f8e7271cc1263e8c5ca3d1bb5734c1f;hb=f5a89916bc70a66b6fa6a3abc4c36023503cd380;hpb=4bc011b7554580ae94eefab1067cefd30b20be48

diff --git a/src/setup.c b/src/setup.c
index 06ff22a..741f35f 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -175,8 +175,8 @@ static void setup_names(void)
 /* Sets up some arrays with localized names.
  * Must be done after iostart() for localization to work. */
 {
-    char *tmp1[] = SYSTEM_NAMES;
-    char *tmp2[] = DEVICE_NAMES;
+    char *tmp1[ARRAY_SIZE(systnames)] = SYSTEM_NAMES;
+    char *tmp2[ARRAY_SIZE(device)] = DEVICE_NAMES;
 
     memcpy(systnames, tmp1, sizeof(systnames));
     memcpy(device, tmp2, sizeof(device));
@@ -324,7 +324,8 @@ void setup(bool needprompt)
 		   game.state.galaxy[w.x][w.y].klingons > 8);
 	    // check for duplicate
 	    for (j = 1; j < i; j++)
-		if (game.state.kcmdr[j].x==w.x && game.state.kcmdr[j].y==w.y) break;
+		if (same(game.state.kcmdr[j], w))
+		    break;
 	} while (j < i);
 	game.state.galaxy[w.x][w.y].klingons++;
 	game.state.kcmdr[i] = w;
@@ -336,12 +337,12 @@ void setup(bool needprompt)
 	game.state.plnets[i].w = w;
 	if (i < NINHAB) {
 	    game.state.plnets[i].pclass = M;	// All inhabited planets are class M
-	    game.state.plnets[i].crystals = 0;
+	    game.state.plnets[i].crystals = absent;
 	    game.state.plnets[i].known = known;
 	    game.state.plnets[i].inhabited = i;
 	} else {
 	    game.state.plnets[i].pclass = Rand()*3.0; // Planet class M N or O
-	    game.state.plnets[i].crystals = 1.5*Rand();		// 1 in 3 chance of crystals
+	    game.state.plnets[i].crystals = Rand()*1.5;		// 1 in 3 chance of crystals
 	    game.state.plnets[i].known = unknown;
 	    game.state.plnets[i].inhabited = UNINHABITED;
 	}
@@ -407,7 +408,7 @@ void setup(bool needprompt)
     waitfor();
     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
+    if (game.neutz) attack(false);	// bad luck to start in a Romulan Neutral Zone
 }
 
 bool choose(bool needprompt) 
@@ -560,7 +561,6 @@ void newqad(bool shutup)
     coord w;
     struct quadrant *q;
 
-    game.iattak = 1;
     game.justin = true;
     game.base.x = game.base.y = 0;
     game.klhere = 0;