/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Ken Stevens, Steve McClure, Markus Armbruster
*
- * This program is free software; you can redistribute it and/or modify
+ * Empire is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* ---
*
* Known contributors to this file:
* Dave Pare, 1986
* Steve McClure, 1998
- * Markus Armbruster, 2006-2008
+ * Markus Armbruster, 2006-2009
*/
#include <config.h>
makelost(EF_PLANE, pp->pln_own, pp->pln_uid,
pp->pln_x, pp->pln_y);
pp->pln_own = 0;
+ pp->pln_ship = pp->pln_land = -1;
return;
}
wu(0, pp->pln_own,
return;
if (carrier->shp_off)
return;
- if ((carrier->shp_own != pp->pln_own) &&
- (getrel(getnatp(carrier->shp_own), pp->pln_own) != ALLIED))
+ if (relations_with(carrier->shp_own, pp->pln_own) != ALLIED)
return;
} else {
- if ((sp->sct_own != pp->pln_own) &&
- (getrel(getnatp(sp->sct_own), pp->pln_own) != ALLIED))
+ if (relations_with(sp->sct_own, pp->pln_own) != ALLIED)
return;
}
delta = 100 - pp->pln_effic;
memset(mvec, 0, sizeof(mvec));
- mvec[I_MILIT] = pcp->pl_crew;
- mvec[I_LCM] = pcp->pl_lcm;
+ mvec[I_MILIT] = pcp->pl_crew;
+ mvec[I_LCM] = pcp->pl_lcm;
mvec[I_HCM] = pcp->pl_hcm;
build = get_materials(sp, bp, mvec, delta);