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

Fuse a few pr() in show_ship_stats() & friends

Browse source 
Also trim trailing space in output.
This commit is contained in:
Markus Armbruster 2011-04-22 18:11:29 +02:00
parent a474791e7b
commit 746aa60530
1 changed files with 10 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/lib/subs/show.c
View file

@ -241,16 +241,11 @@ show_ship_stats(int tlev)
if ((mp->m_flags & M_TRADE) && !opt_TRADESHIPS) if ((mp->m_flags & M_TRADE) && !opt_TRADESHIPS)
continue; continue;
pr("%-25.25s %3d %2d %2d %2d %2d %2d ", pr("%-25.25s %3d %2d %2d %2d %2d %2d %2d %2d %2d %2d\n",
mp->m_name, m_armor(mp, tlev), m_speed(mp, tlev), mp->m_name, m_armor(mp, tlev), m_speed(mp, tlev),
m_visib(mp, tlev), mp->m_vrnge, m_visib(mp, tlev), mp->m_vrnge,
m_frnge(mp, tlev), m_glim(mp, tlev)); m_frnge(mp, tlev), m_glim(mp, tlev),
mp->m_nland, mp->m_nplanes, mp->m_nchoppers, mp->m_nxlight);
pr("%2d ", mp->m_nland);
pr("%2d ", mp->m_nplanes);
pr("%2d ", mp->m_nchoppers);
pr("%2d ", mp->m_nxlight);
pr("\n");
} }
} }
@ -286,12 +281,10 @@ show_plane_stats(int tlev)
make_new_list(tlev, EF_PLANE); make_new_list(tlev, EF_PLANE);
for (pcount = 0; pcount < lookup_list_cnt; pcount++) { for (pcount = 0; pcount < lookup_list_cnt; pcount++) {
pp = (struct plchrstr *)lookup_list[pcount].l_u.pp; pp = (struct plchrstr *)lookup_list[pcount].l_u.pp;
pr("%-25.25s %3d %4d %3d %3d %3d %4d ", pr("%-25.25s %3d %4d %3d %3d %3d %4d %4d%%\n",
pp->pl_name, pl_acc(pp, tlev), pl_load(pp, tlev), pp->pl_name, pl_acc(pp, tlev), pl_load(pp, tlev),
pl_att(pp, tlev), pl_def(pp, tlev), pl_range(pp, tlev), pl_att(pp, tlev), pl_def(pp, tlev), pl_range(pp, tlev),
pp->pl_fuel); pp->pl_fuel, pp->pl_stealth);
pr("%4d%% ", pp->pl_stealth);
pr("\n");
} }
} }
@ -386,17 +379,13 @@ show_land_stats(int tlev)
if ((lcp->l_flags & L_SPY) && !opt_LANDSPIES) if ((lcp->l_flags & L_SPY) && !opt_LANDSPIES)
continue; continue;
pr("%-25s %1.1f %1.1f %3d ", pr("%-25s %1.1f %1.1f %3d %2d %2d %2d %2d %2d %2d %2d %2d %2d"
" %2d %2d\n",
lcp->l_name, lcp->l_name,
l_att(lcp, tlev), l_def(lcp, tlev), l_vul(lcp, tlev)); l_att(lcp, tlev), l_def(lcp, tlev), l_vul(lcp, tlev),
pr("%2d %2d %2d %2d ", l_spd(lcp, tlev), lcp->l_vis, lcp->l_spy, lcp->l_rad,
l_spd(lcp, tlev), lcp->l_vis, lcp->l_spy, lcp->l_rad);
pr("%2d %2d %2d %2d %2d ",
l_frg(lcp, tlev), l_acc(lcp, tlev), l_dam(lcp, tlev), l_frg(lcp, tlev), l_acc(lcp, tlev), l_dam(lcp, tlev),
lcp->l_ammo, lcp->l_aaf); lcp->l_ammo, lcp->l_aaf, lcp->l_nxlight, lcp->l_nland);
pr("%2d %2d ",
lcp->l_nxlight, lcp->l_nland);
pr("\n");
} }
} }