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

Distinguish between planes "in orbit" and "launched"

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

4
src/lib/commands/laun.c
View file

@ -82,7 +82,7 @@ laun(void)
prplane(&plane));
continue;
}
if ((plane.pln_flags & PLN_LAUNCHED) && (pcp->pl_flags & P_O)) {
if (pln_is_in_orbit(&plane)) {
pr("%s already in orbit!\n", prplane(&plane));
continue;
}
@ -193,7 +193,7 @@ launch_as(struct plnstr *pp)
while (!goodtarget && nxtitem(&ni, &plane)) {
if (!plane.pln_own)
continue;
if (!(plane.pln_flags & PLN_LAUNCHED))
if (!pln_is_in_orbit(&plane))
continue;
goodtarget = 1;