Distinguish between planes "in orbit" and "launched"

Use new pln_is_in_orbit() when we want to test for orbit specifically,
and test PLN_LAUNCHED when we want to test whether the plane not
sitting in the sector (because it is flying).  This distinction is
pointless at this time, because the only way PLN_LAUNCHED gets set is
when a satellite goes into orbit.  It will become useful in a later
commit, which will use PLN_LAUNCHED to mark flying planes.
This commit is contained in:
Markus Armbruster 2008-03-22 18:38:51 +01:00
parent 5e930f5fdf
commit 8006543878
12 changed files with 26 additions and 27 deletions

View file

@ -74,10 +74,8 @@ plan(void)
pr("%5dL", plane.pln_land);
else
pr(" ");
if (plane.pln_flags & PLN_SYNCHRONOUS)
pr(" geosync");
else if (plane.pln_flags & PLN_LAUNCHED)
pr(" orbit");
if (pln_is_in_orbit(&plane))
pr((plane.pln_flags & PLN_SYNCHRONOUS) ? " geosync" : " orbit");
else if (plane.pln_nuketype >= 0)
pr(" %-5.5s %c",
nchr[(int)plane.pln_nuketype].n_name,