More applications of same().

[super-star-trek.git] / src / setup.c

diff --git a/src/setup.c b/src/setup.c
index b254a548ff2fa2df5d8c85cd175044c011f8e033..7e1b65257f96120f2971be5b66d7f5c486743548 100644 (file)
--- 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));
@@ -274,12 +274,12 @@ void setup(bool needprompt)
                if (distq < 6.0*(BASEMAX+1-game.inbase) && Rand() < 0.75) {
                    contflag = true;
                    if (idebug)
-                       prout(_("=== Abandoning base #%d at %d-%d"), i, w.x, w.y);
+                       prout("=== Abandoning base #%d at %d-%d", i, w.x, w.y);
                    break;
                }
                else if (distq < 6.0 * (BASEMAX+1-game.inbase)) {
                    if (idebug)
-                       prout(_("=== Saving base #%d, close to #%d"), i, j);
+                       prout("=== Saving base #%d, close to #%d", i, j);
                }
            }
        } while (contflag);
@@ -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;
@@ -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;