empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(starve): Prompted twice for sectors when first argument was empty,

Browse source 
fix.  Simplify.
This commit is contained in:
Markus Armbruster 2006-05-01 06:52:48 +00:00
parent d26c84ee36
commit 7c3899bf89
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/lib/commands/strv.c
View file

@ -61,29 +61,27 @@ starve(void)
int do_sects = 0; int do_sects = 0;
int do_ships = 0; int do_ships = 0;
int do_units = 0; int do_units = 0;
char range[1024]; char *range;
if (opt_NOFOOD) { /* no food - no work! */ if (opt_NOFOOD) { /* no food - no work! */
pr("No food is required in this game\n"); pr("No food is required in this game\n");
return RET_OK; return RET_OK;
} }
strcpy(range, "*"); range = "*";
if (!player->argp[1]) { if (!player->argp[1]) {
do_sects = do_ships = do_units = 1; do_sects = do_ships = do_units = 1;
} else if (*(player->argp[1]) == 's') { } else if (*(player->argp[1]) == 's') {
do_ships = 1; do_ships = 1;
if (player->argp[2]) if (player->argp[2])
strcpy(range, player->argp[2]); range = player->argp[2];
} else if (*(player->argp[1]) == 'l') { } else if (*(player->argp[1]) == 'l') {
do_units = 1; do_units = 1;
if (player->argp[2]) if (player->argp[2])
strcpy(range, player->argp[2]); range = player->argp[2];
} else { } else {
if (!snxtsct(&nstr, player->argp[1]))
return RET_SYN;
do_sects = 1; do_sects = 1;
strcpy(range, player->argp[1]); range = player->argp[1];
} }
player->simulation = 1; player->simulation = 1;
prdate(); prdate();