allow gcc to still do the bounds checking

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

diff --git a/src/setup.c b/src/setup.c
index 06ff22ac3f8e7271cc1263e8c5ca3d1bb5734c1f..e0ca59da9b9d3c5e3bf76c72cca660eb538b1980 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));
@@ -407,7 +407,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)