/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2013, 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:
* Ken Stevens, 1995
* Steve McClure, 1996-2000
- * Markus Armbruster, 2003-2009
+ * Markus Armbruster, 2003-2012
*/
#include <config.h>
#include "item.h"
#include "misc.h"
#include "mission.h"
+#include "news.h"
#include "nsc.h"
#include "optlist.h"
#include "path.h"
-#include "player.h"
+#include "plague.h"
#include "prototypes.h"
#include "queue.h"
#include "xy.h"
if (!in_oparea((struct empobj *)&plane, x, y))
continue;
plp = malloc(sizeof(struct plist));
- memset(plp, 0, sizeof(struct plist));
+ plp->load = 0;
+ plp->pstage = PLG_HEALTHY;
plp->pcp = &plchr[(int)plane.pln_type];
plp->plane = plane;
emp_insque(&plp->queue, escorts);
else {
/* save planes for later */
plp = malloc(sizeof(struct plist));
-
- memset(plp, 0, sizeof(struct plist));
+ plp->load = 0;
+ plp->pstage = PLG_HEALTHY;
plp->pcp = pcp;
memcpy(&plp->plane, glp->thing, sizeof(struct plnstr));
if (plp->pcp->pl_flags & P_M)
{
struct emp_qelem *qp, *newqp, escorts, airp, b, e;
struct plist *plp;
- int plane_owner, performed, air_dam, md;
+ int plane_owner, performed, air_dam;
+ size_t md;
emp_initque(&escorts);
emp_initque(&airp);
performed = air_dam = 0;
for (qp = airp.q_forw; qp != (&airp); qp = qp->q_forw) {
struct airport *air;
- char buf[512];
- char *pp;
+ char buf[1024];
air = (struct airport *)qp;
- md = mapdist(x, y, air->x, air->y);
emp_initque(&b);
emp_initque(&e);
/* Split off the escorts at this base into e */
divide(&escorts, &e, air->x, air->y);
- mission_pln_arm(&b, air->x, air->y, 2 * md, 'p', NULL);
+ if (path_find(air->x, air->y, x, y, plane_owner, MOB_FLY) < 0)
+ continue;
+ md = path_find_route(buf, sizeof(buf), air->x, air->y, x, y);
+ if (md >= sizeof(buf))
+ continue;
+ mission_pln_arm(&b, air->x, air->y, 2 * md, 'p', NULL);
if (QEMPTY(&b))
continue;
-
mission_pln_arm(&e, air->x, air->y, 2 * md, 'e', NULL);
- pp = BestAirPath(buf, air->x, air->y, x, y);
- if (CANT_HAPPEN(!pp))
- continue;
performed = 1;
wu(0, plane_owner, "Flying %s mission from %s to %s\n",
mission_name(mission),
xyas(x, y, air->own));
}
- ac_encounter(&b, &e, air->x, air->y, pp, 0);
+ ac_encounter(&b, &e, air->x, air->y, buf, 0);
if (!QEMPTY(&b))
air_dam +=
pcp = plp->pcp;
if (pp->pln_ship >= 0) {
getship(pp->pln_ship, &ship);
+ plp->pstage = ship.shp_pstage;
item = ship.shp_item;
} else if (pp->pln_land >= 0) {
getland(pp->pln_land, &land);
+ plp->pstage = land.lnd_pstage;
item = land.lnd_item;
} else {
getsect(pp->pln_x, pp->pln_y, §);
+ plp->pstage = sect.sct_pstage;
item = sect.sct_item;
}
if (pcp->pl_fuel > item[I_PETROL]) {