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

(pln_airbase_ok, mission_pln_airbase_ok): Simplify conditional. Don't

Browse source 
check a land carrier when the plane is already on a ship.
This commit is contained in:
Markus Armbruster 2007-11-03 07:52:50 +00:00
parent a873eb1b4f
commit 79c2a10b30
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/lib/subs/mission.c
View file

@ -929,8 +929,8 @@ mission_pln_airbase_ok(struct plnstr *pp)
(getrel(getnatp(ship.shp_own), pp->pln_own) != ALLIED))) { (getrel(getnatp(ship.shp_own), pp->pln_own) != ALLIED))) {
return 0; return 0;
} }
}
if (pp->pln_land >= 0) { } else if (pp->pln_land >= 0) {
if (!getland(pp->pln_land, &land)) { if (!getland(pp->pln_land, &land)) {
landdead: landdead:
pp->pln_effic = 0; pp->pln_effic = 0;
@ -953,9 +953,8 @@ mission_pln_airbase_ok(struct plnstr *pp)
if ((land.lnd_ship >= 0) || (land.lnd_land >= 0)) { if ((land.lnd_ship >= 0) || (land.lnd_land >= 0)) {
return 0; return 0;
} }
}
/* Now, check the sector status if not on a plane or unit */ } else {
if ((pp->pln_ship < 0) && (pp->pln_land < 0)) {
/* If we can't get the sector, we can't check it, and can't fly */ /* If we can't get the sector, we can't check it, and can't fly */
if (!getsect(pp->pln_x, pp->pln_y, &sect)) { if (!getsect(pp->pln_x, pp->pln_y, &sect)) {
return 0; return 0;
@ -973,6 +972,7 @@ mission_pln_airbase_ok(struct plnstr *pp)
} }
} }
} }
return 1; return 1;
} }

11
src/lib/subs/plnsub.c
View file

@ -384,6 +384,7 @@ pln_capable(struct plnstr *pp, int wantflags, int nowantflags)
return 1; return 1;
} }
static int static int
pln_airbase_ok(struct plnstr *pp, int oneway) pln_airbase_ok(struct plnstr *pp, int oneway)
{ {
@ -414,8 +415,8 @@ pln_airbase_ok(struct plnstr *pp, int oneway)
prplane(pp)); prplane(pp));
return 0; return 0;
} }
}
if (pp->pln_land >= 0) { } else if (pp->pln_land >= 0) {
if (!getland(pp->pln_land, &land) || if (!getland(pp->pln_land, &land) ||
(pp->pln_own != player->cnum)) { (pp->pln_own != player->cnum)) {
landdead: landdead:
@ -440,9 +441,8 @@ pln_airbase_ok(struct plnstr *pp, int oneway)
prplane(pp)); prplane(pp));
return 0; return 0;
} }
}
/* Now, check the sector status if not on a plane or unit */ } else {
if ((pp->pln_ship < 0) && (pp->pln_land < 0)) {
if (!getsect(pp->pln_x, pp->pln_y, &sect)) if (!getsect(pp->pln_x, pp->pln_y, &sect))
return 0; return 0;
/* First, check allied status */ /* First, check allied status */
@ -471,6 +471,7 @@ pln_airbase_ok(struct plnstr *pp, int oneway)
} }
} }
} }
return 1; return 1;
} }