/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
* 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);