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

bomb: Don't list bombable commodities on invalid selection

Browse source 
comm_bomb() first lists commodities that can be bombed and are
present, then prompts for the one to bomb.  If the player selects a
bomb-proof one, it rejects it, lists the bombable ones, and prompts
again.  This can only happen when option SUPER_BARS is enabled, and
the player selects bars.  Looks like this:

    Bomb what? (ship, plane, land unit, efficiency, commodities) c
    some civilians
    some military
    commodity to bomb? b
    You can't bomb bars of gold!
    Bombable: civilians, military, shells, guns, petrol, iron ore, dust (gold), food, oil, light products, heavy products, uncompensated workers, radioactive materials
    commodity to bomb?

The list is of marginal value.  It was more useful back when
comm_bomb() didn't list commodities before prompting (BSD Empire 1.1).
It's also illegible.  Drop it.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-05-29 11:58:32 +02:00
parent e8b0e14d3d
commit 4b8c429d00
1 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/lib/commands/bomb.c
View file

@ -329,16 +329,9 @@ comm_bomb(struct emp_qelem *list, struct sctstr *target)
if (&ichr[bombcomm[i]] == ip) if (&ichr[bombcomm[i]] == ip)
break; break;
} }
if (i == nbomb) { if (i == nbomb)
pr("You can't bomb %s!\n", ip->i_name); pr("You can't bomb %s!\n", ip->i_name);
for (i = 0; i < nbomb; i++) { else
if (opt_SUPER_BARS && bombcomm[i] == I_BAR)
continue;
pr("%s%s", i == 0 ? "Bombable: " : ", ",
ichr[bombcomm[i]].i_name);
}
pr("\n");
} else
break; break;
} }
for (qp = list->q_forw; qp != list; qp = next) { for (qp = list->q_forw; qp != list; qp = next) {