More applications of same().

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

diff --git a/src/setup.c b/src/setup.c
index e0ca59da9b9d3c5e3bf76c72cca660eb538b1980..7e1b65257f96120f2971be5b66d7f5c486743548 100644 (file)
--- a/src/setup.c
+++ b/src/setup.c
@@ -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;
@@ -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;