Get rid of obnoxious iattak global.

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

diff --git a/src/setup.c b/src/setup.c
index e4ee63def95f31f8d1baa964333c5b441adb237c..8bbafbc31e539f43fd0b7927979a31af22f303e7 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));
@@ -560,7 +560,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;