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

(powe): Simplify evaluation of arg 1. No functional change.

Browse source
This commit is contained in:
Markus Armbruster 2006-07-13 19:57:56 +00:00
parent 7282d4d639
commit b27c7ea77d
1 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/lib/commands/powe.c
View file

@ -73,25 +73,28 @@ powe(void)
memset(targets, 0, sizeof(targets)); memset(targets, 0, sizeof(targets));
natp = getnatp(player->cnum); natp = getnatp(player->cnum);
num = MAXNOC; num = MAXNOC;
if (player->argp[1] && player->argp[1][0] == 'n') {
if (natp->nat_btu < 1) if (player->argp[1]) {
pr("\n Insufficient BTUs, using the last report.\n\n"); if (player->argp[1][0] == 'n') {
else { if (natp->nat_btu < 1)
gen_power(); pr("\n Insufficient BTUs, using the last report.\n\n");
power_generated = 1; else {
if (player->argp[2]) gen_power();
num = atoi(player->argp[2]); power_generated = 1;
} if (player->argp[2])
} else if (player->argp[1] && player->argp[1][0] == 'c') { num = atoi(player->argp[2]);
snxtitem(&ni, EF_NATION, player->argp[2]); }
while (nxtitem(&ni, &nat)) { } else if (player->argp[1][0] == 'c') {
if (nat.nat_stat != STAT_ACTIVE) snxtitem(&ni, EF_NATION, player->argp[2]);
continue; while (nxtitem(&ni, &nat)) {
targets[nat.nat_cnum] = 1; if (nat.nat_stat != STAT_ACTIVE)
} continue;
use_targets = 1; targets[nat.nat_cnum] = 1;
} else if (player->argp[1]) }
num = atoi(player->argp[1]); use_targets = 1;
} else
num = atoi(player->argp[1]);
}
if (num < 0) { if (num < 0) {
if (!player->god) if (!player->god)