From 5d41e56aeee14a185ed8f9e6c518c9d2d1867858 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 3 Nov 2007 08:53:21 +0000 Subject: [PATCH] (pln_airbase_ok): Check pp->pln_own instead of player->cnum, in preparation of replacing mission_pln_airbase_ok(). No functional change. --- src/lib/subs/plnsub.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/subs/plnsub.c b/src/lib/subs/plnsub.c index 327d42b3..c042decb 100644 --- a/src/lib/subs/plnsub.c +++ b/src/lib/subs/plnsub.c @@ -405,8 +405,8 @@ pln_airbase_ok(struct plnstr *pp, int oneway) || !could_be_on_ship(pp, &ship))) return 0; - if ((ship.shp_own != player->cnum) && - (getrel(getnatp(ship.shp_own), player->cnum) != ALLIED)) { + if (ship.shp_own != pp->pln_own + && getrel(getnatp(ship.shp_own), pp->pln_own) != ALLIED) { pr("(note) An ally does not own the ship %s is on\n", prplane(pp)); return 0; @@ -423,8 +423,8 @@ pln_airbase_ok(struct plnstr *pp, int oneway) || !(pcp->pl_flags & P_E))) return 0; - if ((land.lnd_own != player->cnum) && - (getrel(getnatp(land.lnd_own), player->cnum) != ALLIED)) { + if (land.lnd_own != pp->pln_own + && getrel(getnatp(land.lnd_own), pp->pln_own) != ALLIED) { pr("(note) An ally does not own the unit %s is on\n", prplane(pp)); return 0; @@ -441,8 +441,8 @@ pln_airbase_ok(struct plnstr *pp, int oneway) } /* First, check allied status */ /* Can't fly from non-owned sectors or non-allied sectors */ - if ((sect.sct_own != player->cnum) && - (getrel(getnatp(sect.sct_own), player->cnum) != ALLIED)) { + if (sect.sct_own != pp->pln_own + && getrel(getnatp(sect.sct_own), pp->pln_own) != ALLIED) { pr("(note) An ally does not own the sector %s is in\n", prplane(pp)); return 0;