X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fsetup.c;h=8bbafbc31e539f43fd0b7927979a31af22f303e7;hp=06ff22ac3f8e7271cc1263e8c5ca3d1bb5734c1f;hb=f2f73e20553ed56a51b878f81098208fb8e5e273;hpb=4bc011b7554580ae94eefab1067cefd30b20be48 diff --git a/src/setup.c b/src/setup.c index 06ff22a..8bbafbc 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)); @@ -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) @@ -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;