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/trad.c
View file

@ -184,7 +184,7 @@ trad(void)
* actually made, except for satellites in orbit. Must be owned
* and must be a 60% airfield (except for VTOL planes).
*/
if (((trade.trd_type == EF_PLANE) && !(tg.plane.pln_flags & PLN_LAUNCHED))
if (((trade.trd_type == EF_PLANE) && !pln_is_in_orbit(&tg.plane))
|| (trade.trd_type == EF_NUKE)) {
while (1) {
p = getstring("Destination sector: ", buf);
@ -364,7 +364,7 @@ check_trade(void)
tg.nuke.nuk_x, tg.nuke.nuk_y);
break;
case EF_PLANE:
if ((tg.plane.pln_flags & PLN_LAUNCHED) == 0) {
if (!pln_is_in_orbit(&tg.plane)) {
tg.plane.pln_x = trade.trd_x;
tg.plane.pln_y = trade.trd_y;
}