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

(land, nuke, plan, shi): Change stop prefix to `!'. Explain it in the

Browse source 
footer when actually present.
This commit is contained in:
Markus Armbruster 2006-06-01 16:29:54 +00:00
parent b8825e962c
commit 016249c9e5
4 changed files with 44 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/lib/commands/shi.c
View file

@ -45,14 +45,14 @@
int
shi(void)
{
int nships;
int nships, noff;
struct nstr_item ni;
struct shpstr ship;
if (!snxtitem(&ni, EF_SHIP, player->argp[1]))
return RET_SYN;
nships = 0;
nships = noff = 0;
while (nxtitem(&ni, &ship)) {
if (!player->owner || ship.shp_own == 0)
continue;
@ -67,13 +67,15 @@ shi(void)
pr(" fuel");
pr(" tech\n");
}
if (ship.shp_off)
noff++;
if (player->god)
pr("%3d ", ship.shp_own);
pr("%4d ", ni.cur);
pr("%-16.16s ", mchr[(int)ship.shp_type].m_name);
prxy("%4d,%-4d ", ship.shp_x, ship.shp_y, player->cnum);
pr("%1.1s", &ship.shp_fleet);
pr(" %c%3d%%", ship.shp_off ? '=' : ' ', ship.shp_effic);
pr(" %c%3d%%", ship.shp_off ? '!' : ' ', ship.shp_effic);
pr("%4d", ship.shp_item[I_CIVIL]);
pr("%4d", ship.shp_item[I_MILIT]);
@ -100,7 +102,11 @@ shi(void)
else
pr("%s: No ship(s)\n", "");
return RET_FAIL;
} else
pr("%d ship%s\n", nships, splur(nships));
} else {
pr("%d ship%s", nships, splur(nships));
if (noff)
pr(", %d stopped (eff marked with !)", noff);
pr("\n");
}
return RET_OK;
}