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

16
src/lib/commands/pdump.c
View file

@ -258,20 +258,12 @@ pdump(void)
pr(" %d", plane.pln_land);
break;
case 18:
if ((plchr[(int)plane.pln_type].pl_flags & (P_O | P_M)) ==
P_O) {
pr(" %c",
(plane.pln_flags & PLN_LAUNCHED) ? 'Y' : 'N');
} else
pr(" N");
pr(pln_is_in_orbit(&plane) ? " Y" : " N");
break;
case 19:
if ((plchr[(int)plane.pln_type].pl_flags & (P_O | P_M)) ==
P_O) {
pr(" %c",
(plane.pln_flags & PLN_SYNCHRONOUS) ? 'Y' : 'N');
} else
pr(" N");
pr(pln_is_in_orbit(&plane)
&& (plane.pln_flags & PLN_SYNCHRONOUS)
? " Y" : " N");
break;
case 20:
if (plane.pln_nuketype != -1) {