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

(qorde): Output messed up for ships with sail path. Fix and

Browse source 
simplify.  Remove inappropriate ship sanity check, should be done
elsewhere, and differently.
This commit is contained in:
Markus Armbruster 2005-07-31 16:19:03 +00:00
parent 591c82bf7c
commit 4c37776458
1 changed files with 18 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/lib/commands/orde.c
View file

@ -373,27 +373,23 @@ qorde(void)
while (nxtitem(&nb, (&ship))) { while (nxtitem(&nb, (&ship))) {
if (!player->owner || ship.shp_own == 0) if (!player->owner || ship.shp_own == 0)
continue; continue;
if (ship.shp_type < 0 || ship.shp_type > shp_maxno) { if (!(ship.shp_autonav & AN_AUTONAV)
pr("bad ship type %d (#%d)\n", ship.shp_type, nb.cur); && (!opt_SAIL || !ship.shp_path[0]))
continue; continue;
}
if ((ship.shp_autonav & AN_AUTONAV) || if (!nships) { /* 1st ship, print banner */
(ship.shp_path[0] && opt_SAIL)) {
if (!nships) { /* 1st ship, print banner */
if (player->god)
pr("own ");
pr("shp# ship type ");
pr("[Starting] (Ending) \n");
}
nships++;
if (player->god) if (player->god)
pr("%3d ", ship.shp_own); pr("own ");
pr("%4d", nb.cur); pr("shp# ship type ");
pr(" %-16.16s", mchr[(int)ship.shp_type].m_name); pr("[Starting] (Ending) \n");
} }
if (ship.shp_autonav & AN_AUTONAV) { nships++;
if (player->god)
pr("%3d ", ship.shp_own);
pr("%4d", nb.cur);
pr(" %-16.16s", mchr[(int)ship.shp_type].m_name);
if (ship.shp_autonav & AN_AUTONAV) {
pr(" ["); pr(" [");
for (i = 0; i < TMAX; i++) for (i = 0; i < TMAX; i++)
prhold(i, ship.shp_tend[i], ship.shp_lend[i]); prhold(i, ship.shp_tend[i], ship.shp_lend[i]);
@ -404,17 +400,13 @@ qorde(void)
if (ship.shp_autonav & AN_SCUTTLE) if (ship.shp_autonav & AN_SCUTTLE)
pr(" scuttling"); pr(" scuttling");
pr("\n"); pr("\n");
} } else
pr("has a sail path\n");
if (opt_SHIPNAMES) { if (opt_SHIPNAMES && ship.shp_name[0] != 0) {
if ((ship.shp_autonav & AN_AUTONAV) || if (player->god)
(ship.shp_path[0] && opt_SAIL)) { pr(" ");
if (ship.shp_name[0] != 0) { pr(" %s\n", ship.shp_name);
if (player->god)
pr(" ");
pr(" %s\n", ship.shp_name);
}
}
} }
} }
if (!nships) { if (!nships) {