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

@ -66,7 +66,7 @@ prod_plane(int etus, int natnum, struct bp *bp, int buildem)
continue;
}
if (pp->pln_flags & PLN_LAUNCHED) {
if (pln_is_in_orbit(pp)) {
if (!player->simulation && buildem == 0
&& !(pp->pln_flags & PLN_SYNCHRONOUS))
move_sat(pp);