/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2020, 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/>.
*
* ---
*
* Dave Pare, 1986
* Thomas Ruschak, 1992
* Steve McClure, 1996
- * Markus Armbruster, 2006-2009
+ * Markus Armbruster, 2006-2014
*/
#include <config.h>
-#include "file.h"
+#include "chance.h"
#include "land.h"
#include "map.h"
#include "misc.h"
#include "nsc.h"
#include "optlist.h"
#include "path.h"
+#include "plague.h"
#include "plane.h"
#include "player.h"
#include "prototypes.h"
#define FLAK_GUN_MAX 14
-static void sam_intercept(struct emp_qelem *, struct emp_qelem *,
- natid, natid, coord, coord, int);
static void ac_intercept(struct emp_qelem *, struct emp_qelem *,
struct emp_qelem *, natid, coord, coord, int);
static void ac_combat_headers(natid, natid);
static void ac_airtoair(struct emp_qelem *, struct emp_qelem *);
static void ac_dog(struct plist *, struct plist *);
-static void ac_planedamage(struct plist *, natid, int, natid, int,
- int, char *);
+static void ac_putplane(struct plist *, int);
static void ac_doflak(struct emp_qelem *, struct sctstr *);
static void ac_landflak(struct emp_qelem *, coord, coord);
static void ac_shipflak(struct emp_qelem *, coord, coord);
static void ac_fireflak(struct emp_qelem *, natid, int);
-static void getilists(struct emp_qelem *, unsigned char *, natid);
+static void getilists(struct emp_qelem *, enum relations[], natid);
static int do_evade(struct emp_qelem *, struct emp_qelem *);
void
int dir;
unsigned char gotships[MAXNOC];
unsigned char gotlands[MAXNOC];
- unsigned char rel[MAXNOC];
+ enum relations rel[MAXNOC];
int overfly[MAXNOC];
int flags;
struct emp_qelem ilist[MAXNOC];
- int civ, mil;
natid plane_owner;
struct sctstr sect;
struct shpstr ship;
memset(overfly, 0, sizeof(overfly));
getilists(ilist, rel, plane_owner);
+ if (CANT_HAPPEN(mission_flags && plane_owner != player->cnum))
+ mission_flags = 0;
+
if (mission_flags & PM_R) {
flags = pln_caps(bomb_list);
if (flags & P_S) {
- PR(plane_owner, "\nSPY Plane report\n");
- PRdate(plane_owner);
+ pr("\nSPY Plane report\n");
+ prdate();
sathead();
} else if (flags & P_A) {
- PR(plane_owner, "\nAnti-Sub Patrol report\n");
+ pr("\nAnti-Sub Patrol report\n");
} else {
- PR(plane_owner, "\nReconnaissance report\n");
- PRdate(plane_owner);
+ pr("\nReconnaissance report\n");
+ prdate();
}
}
if (mission_flags & PM_R) {
flags = pln_caps(bomb_list);
if (opt_HIDDEN)
- setcont(plane_owner, sect.sct_own, FOUND_FLY);
- if (sect.sct_type == SCT_WATER) {
- PR(plane_owner, "flying over %s at %s\n",
- dchr[sect.sct_type].d_name, xyas(x, y, plane_owner));
- if (mission_flags & PM_S)
- plane_sweep(bomb_list, x, y);
- if (flags & P_A)
- plane_sona(bomb_list, x, y, &head);
- changed += map_set(plane_owner,
- sect.sct_x, sect.sct_y,
- dchr[sect.sct_type].d_mnem, 0);
- } else if (flags & P_S) {
+ setcont(player->cnum, sect.sct_own, FOUND_FLY);
+ if (sect.sct_type == SCT_WATER)
+ pr("flying over %s at %s\n",
+ dchr[sect.sct_type].d_name, xyas(x, y, player->cnum));
+ else if (flags & P_S)
satdisp_sect(§, flags & P_I ? 10 : 50);
- } else {
- /* This is borrowed from lookout */
- if (sect.sct_own == plane_owner)
- PR(plane_owner, "Your ");
- else
- PR(plane_owner, "%s (#%d) ",
- cname(sect.sct_own), sect.sct_own);
- PR(plane_owner, "%s", dchr[sect.sct_type].d_name);
- changed += map_set(plane_owner,
- sect.sct_x, sect.sct_y,
- dchr[sect.sct_type].d_mnem, 0);
- PR(plane_owner, " %d%% efficient ",
- (sect.sct_own == plane_owner) ?
- sect.sct_effic : roundintby((int)sect.sct_effic, 25));
- civ = sect.sct_item[I_CIVIL];
- mil = sect.sct_item[I_MILIT];
- if (civ)
- PR(plane_owner, "with %s%d civ ",
- (sect.sct_own == plane_owner) ?
- "" : "approx ",
- (sect.sct_own == plane_owner) ?
- civ : roundintby(civ, 25));
- if (mil)
- PR(plane_owner, "with %s%d mil ",
- (sect.sct_own == plane_owner) ?
- "" : "approx ",
- (sect.sct_own == plane_owner) ?
- mil : roundintby(mil, 25));
- PR(plane_owner, "@ %s\n", xyas(x, y, plane_owner));
- }
+ else
+ look_at_sect(§, 25);
+
if (flags & P_S)
satdisp_units(sect.sct_x, sect.sct_y);
else {
for (cn = 1; cn < MAXNOC; cn++) {
- if (cn == plane_owner)
+ if (cn == player->cnum)
continue;
if (gotships[cn])
- PR(plane_owner, "Flying over %s ships in %s\n",
- cname(cn), xyas(x, y, plane_owner));
+ pr("Flying over %s ships in %s\n",
+ cname(cn), xyas(x, y, player->cnum));
if (gotlands[cn])
- PR(plane_owner, "Flying over %s land units in %s\n",
- cname(cn), xyas(x, y, plane_owner));
+ pr("Flying over %s land units in %s\n",
+ cname(cn), xyas(x, y, player->cnum));
}
}
- } else {
- PR(plane_owner, "flying over %s at %s\n",
- dchr[sect.sct_type].d_name, xyas(x, y, plane_owner));
- changed += map_set(plane_owner, sect.sct_x, sect.sct_y,
- dchr[sect.sct_type].d_mnem, 0);
- }
+ } else
+ mpr(plane_owner, "flying over %s at %s\n",
+ dchr[sect.sct_type].d_name, xyas(x, y, plane_owner));
+ changed += map_set(plane_owner, sect.sct_x, sect.sct_y,
+ dchr[sect.sct_type].d_mnem, 0);
evaded = do_evade(bomb_list, esc_list);
if (!evaded) {
overfly[sect.sct_own]++;
for (cn = 1; cn < MAXNOC; cn++) {
- if (cn == plane_owner || rel[cn] == ALLIED)
+ if (rel[cn] == ALLIED)
continue;
if (cn != sect.sct_own && !gotships[cn] && !gotlands[cn])
continue;
- PR(cn, "%s planes spotted over %s\n",
- cname(plane_owner), xyas(x, y, cn));
+ mpr(cn, "%s planes spotted over %s\n",
+ cname(plane_owner), xyas(x, y, cn));
if (opt_HIDDEN)
setcont(cn, plane_owner, FOUND_FLY);
}
}
}
+ if (mission_flags & PM_R) {
+ flags = pln_caps(bomb_list);
+ if (sect.sct_type == SCT_WATER && mission_flags & PM_S)
+ plane_sweep(bomb_list, x, y);
+ if (sect.sct_type == SCT_WATER && flags & P_A)
+ plane_sona(bomb_list, x, y, &head);
+ }
+
dir = *path++;
if (!dir || QEMPTY(bomb_list) || (val = diridx(dir)) == DIR_STOP)
break;
/* Let's report all of the overflights even if aborted */
for (cn = 1; cn < MAXNOC; cn++) {
- if (plane_owner == cn)
- continue;
if (overfly[cn] > 0 && rel[cn] != ALLIED)
nreport(plane_owner, N_OVFLY_SECT, cn, overfly[cn]);
}
/* If the map changed, update it */
if (changed)
- writemap(player->cnum);
+ writemap(plane_owner);
free_shiplist(&head);
for (cn = 1; cn < MAXNOC; cn++)
&& pp->pln_radius < mapdist(x, y, pp->pln_opx, pp->pln_opy))
continue;
if (CANT_HAPPEN(pp->pln_flags & PLN_LAUNCHED)
- || mission_pln_equip(dplp, 0, P_F, 0) < 0) {
+ || mission_pln_equip(dplp, NULL, 0) < 0) {
emp_remque(dqp);
free(dqp);
continue;
putplane(pp->pln_uid, pp);
if (first) {
first = 0;
- PR(plane_owner, "%s launches SAMs!\n", cname(def_own));
- PR(def_own, "Launching SAMs at %s planes over %s!\n",
- cname(plane_owner), xyas(x, y, def_own));
+ mpr(plane_owner, "%s launches SAMs!\n", cname(def_own));
+ mpr(def_own, "Launching SAMs at %s planes over %s!\n",
+ cname(plane_owner), xyas(x, y, def_own));
ac_combat_headers(plane_owner, def_own);
}
ac_dog(aplp, dplp);
}
}
if (!first) {
- PR(plane_owner, "\n");
- PR(def_own, "\n");
+ mpr(plane_owner, "\n");
+ mpr(def_own, "\n");
}
}
sam_intercept(esc_list, def_list, def_own, plane_owner, x, y,
only_mission);
- att_count = 0;
- for (qp = bomb_list->q_forw; qp != bomb_list; qp = qp->q_forw)
- att_count++;
- for (qp = esc_list->q_forw; qp != esc_list; qp = qp->q_forw)
- att_count++;
+ att_count = emp_quelen(bomb_list) + emp_quelen(esc_list);
if (!att_count)
return;
&& pp->pln_radius < mapdist(x, y, pp->pln_opx, pp->pln_opy))
continue;
if (CANT_HAPPEN(pp->pln_flags & PLN_LAUNCHED)
- || mission_pln_equip(plp, 0, P_F, 0) < 0) {
+ || mission_pln_equip(plp, NULL, 0) < 0) {
emp_remque(qp);
free(qp);
continue;
emp_remque(qp);
emp_insque(qp, &int_list);
pp->pln_flags |= PLN_LAUNCHED;
- pp->pln_mobil -= pln_mobcost(dist, pp, P_F);
+ pp->pln_mobil -= pln_mobcost(dist, pp, 0);
putplane(pp->pln_uid, pp);
icount++;
if (icount > att_count)
}
if (icount == 0)
return;
- PR(plane_owner, "%d %s fighter%s rising to intercept!\n",
- icount, cname(def_own), icount == 1 ? " is" : "s are");
- PR(def_own, "%d fighter%s intercepting %s planes over %s!\n",
- icount, icount == 1 ? " is" : "s are", cname(plane_owner),
- xyas(x, y, def_own));
+ mpr(plane_owner, "%d %s fighter%s rising to intercept!\n",
+ icount, cname(def_own), icount == 1 ? " is" : "s are");
+ mpr(def_own, "%d fighter%s intercepting %s planes over %s!\n",
+ icount, icount == 1 ? " is" : "s are", cname(plane_owner),
+ xyas(x, y, def_own));
ac_combat_headers(plane_owner, def_own);
ac_airtoair(esc_list, &int_list);
ac_airtoair(bomb_list, &int_list);
- PR(plane_owner, "\n");
- PR(def_own, "\n");
+ mpr(plane_owner, "\n");
+ mpr(def_own, "\n");
pln_put(&int_list);
}
static void
ac_combat_headers(natid plane_owner, natid def_own)
{
- PR(plane_owner,
- " %-10.10s %-10.10s strength int odds damage results\n",
- cname(plane_owner), cname(def_own));
- PR(def_own,
- " %-10.10s %-10.10s strength int odds damage results\n",
- cname(def_own), cname(plane_owner));
+ mpr(plane_owner,
+ " %-10.10s %-10.10s strength int odds damage results\n",
+ cname(plane_owner), cname(def_own));
+ mpr(def_own,
+ " %-10.10s %-10.10s strength int odds damage results\n",
+ cname(def_own), cname(plane_owner));
}
/*
struct plist *interceptor;
struct emp_qelem *att;
struct emp_qelem *in;
- int nplanes;
int more_att;
int more_int;
struct emp_qelem *att_next;
att_next = att->q_forw;
attacker = (struct plist *)att;
interceptor = (struct plist *)in;
- nplanes = attacker->plane.pln_effic;
- if (nplanes > interceptor->plane.pln_effic)
- nplanes = interceptor->plane.pln_effic;
ac_dog(attacker, interceptor);
in = in_next;
att = att_next;
}
}
+static void
+ac_dog_report(natid to, int intensity, double odds,
+ struct plist *p1, int val1, int dam1, char *dam_mesg1,
+ struct plist *p2, int val2, int dam2, char *dam_mesg2)
+{
+ mpr(to, " %3.3s #%-4d %3.3s #%-4d %3d/%-3d %3d %3.2f %3d/%-3d"
+ "%-13.13s %-13.13s\n",
+ p1->pcp->pl_name, p1->plane.pln_uid,
+ p2->pcp->pl_name, p2->plane.pln_uid,
+ val1, val2, intensity, odds, dam1, dam2,
+ dam_mesg1, dam_mesg2);
+}
+
static void
ac_dog(struct plist *ap, struct plist *dp)
{
int att, def;
double odds;
- int intensity;
+ int intensity, i;
natid att_own, def_own;
- int adam, ddam;
- char mesg[1024];
- char temp[14];
+ int adam, ddam, adisp, ddisp;
+ char adam_mesg[14], ddam_mesg[14];
att_own = ap->plane.pln_own;
def_own = dp->plane.pln_own;
- PR(att_own, " %3.3s #%-4d %3.3s #%-4d",
- ap->pcp->pl_name,
- ap->plane.pln_uid, dp->pcp->pl_name, dp->plane.pln_uid);
- if (def_own)
- PR(def_own, " %3.3s #%-4d %3.3s #%-4d",
- dp->pcp->pl_name,
- dp->plane.pln_uid, ap->pcp->pl_name, ap->plane.pln_uid);
att = pln_att(&ap->plane);
if (att == 0)
att = pln_def(&ap->plane);
def = pln_def(&dp->plane) * dp->plane.pln_effic / 100;
def = MAX(def, dp->pcp->pl_def / 2);
- if ((ap->pcp->pl_flags & P_F) && ap->bombs != 0)
+ if ((ap->pcp->pl_flags & P_F) && ap->load != 0)
att -= 2;
- if ((dp->pcp->pl_flags & P_F) && dp->bombs != 0)
+ if ((dp->pcp->pl_flags & P_F) && dp->load != 0)
def -= 2;
att += ap->pcp->pl_stealth / 25.0;
def += dp->pcp->pl_stealth / 25.0;
odds = 0.05;
intensity = roll(20) + roll(20) + roll(20) + roll(20) + 1;
- PR(att_own, " %3d/%-3d %3d %3.2f ", att, def, intensity, odds);
- PR(def_own, " %3d/%-3d %3d %3.2f ", def, att, intensity, odds);
-
adam = 0;
ddam = 0;
- while ((intensity--) > 0) {
-
+ for (i = 0; i < intensity; i++) {
if (chance(odds)) {
- ddam += 1;
- if ((dp->plane.pln_effic - ddam) < PLANE_MINEFF)
- intensity = 0;
+ ddam++;
+ if (dp->plane.pln_effic - ddam < PLANE_MINEFF)
+ break;
} else {
- adam += 1;
- if ((ap->plane.pln_effic - adam) < PLANE_MINEFF)
- intensity = 0;
+ adam++;
+ if (ap->plane.pln_effic - adam < PLANE_MINEFF)
+ break;
}
}
if (dp->pcp->pl_flags & P_M)
ddam = 100;
- PR(att_own, "%3d/%-3d", adam, ddam);
- PR(def_own, "%3d/%-3d", ddam, adam);
- ac_planedamage(ap, def_own, adam, def_own, 1, 0, mesg);
- strncpy(temp, mesg, 14);
- ac_planedamage(dp, att_own, ddam, att_own, 1, 0, mesg);
- PR(att_own, "%-13.13s %-13.13s\n", temp, mesg);
- PR(def_own, "%-13.13s %-13.13s\n", mesg, temp);
+ adisp = ac_damage_plane(&ap->plane, def_own, adam, 0, adam_mesg);
+ ddisp = ac_damage_plane(&dp->plane, att_own, ddam, 0, ddam_mesg);
+ ac_dog_report(att_own, intensity, odds,
+ ap, att, adam, adam_mesg,
+ dp, def, ddam, ddam_mesg);
+ ac_dog_report(def_own, intensity, odds,
+ dp, def, ddam, ddam_mesg,
+ ap, att, adam, adam_mesg);
+ ac_putplane(ap, adisp);
+ ac_putplane(dp, ddisp);
if (opt_HIDDEN) {
setcont(att_own, def_own, FOUND_FLY);
}
}
-/*
- * zap plane associated with plp.
- * Damaging country is "from", damage is "dam".
- * def_own is the country on the other side of the conflict from the plane
- * owner. The only time def_own != from is when the interceptor is getting
- * damaged.
- *
- * NOTE: This routine removes the appropriate plane element from the
- * queue if it gets destroyed. That means that the caller must assume
- * that the current queue pointer is invalid on return from the ac_planedamage
- * call. (this has caused bugs in the past)
- */
-static void
-ac_planedamage(struct plist *plp, natid from, int dam, natid other,
- int checkabort, int show, char *mesg)
+int
+ac_damage_plane(struct plnstr *pp, natid from, int dam, int flak,
+ char *mesg)
{
- struct plnstr *pp;
- int disp;
- char dmess[255];
- int eff;
- natid plane_owner;
+ int eff, disp;
- disp = 0;
- pp = &plp->plane;
- plane_owner = pp->pln_own;
- eff = pp->pln_effic;
- sprintf(dmess, " no damage");
+ *mesg = 0;
if (dam <= 0) {
- strcpy(mesg, dmess);
- return;
+ if (!flak)
+ snprintf(mesg, 14, " no damage");
+ return 0;
}
- memset(dmess, 0, sizeof(dmess));
- eff -= dam;
+
+ eff = pp->pln_effic - dam;
if (eff < 0)
eff = 0;
+
+ disp = 0;
if (eff < PLANE_MINEFF) {
- sprintf(dmess, " shot down");
+ snprintf(mesg, 14, " shot down");
disp = 1;
- } else if (eff < 80 && chance((80 - eff) / 100.0) && checkabort) {
- sprintf(dmess, " aborted @%2d%%", eff);
+ } else if (eff < 80 && chance((80 - eff) / 100.0)) {
+ snprintf(mesg, 14, " aborted @%2d%%", eff);
disp = 2;
- } else if (show == 0) {
- sprintf(dmess, " cleared");
- }
-
- if ((plp->pcp->pl_flags & P_M) == 0) {
- if (show) {
- PR(plane_owner, " %s %s takes %d%s.\n",
- cname(pp->pln_own), prplane(pp), dam, dmess);
- if (other)
- PR(other, " %s %s takes %d%s.\n",
- cname(pp->pln_own), prplane(pp), dam, dmess);
- }
- }
- if (show && checkabort == 1) {
- PR(plane_owner, "\n");
- if (other)
- PR(other, "\n");
- }
+ } else if (!flak)
+ snprintf(mesg, 14, " cleared");
pp->pln_effic = eff;
pp->pln_mobil -= MIN(32 + pp->pln_mobil, dam / 2);
- if (disp) {
- if (disp == 1 && from != 0 && (plp->pcp->pl_flags & P_M) == 0)
- nreport(from, N_DOWN_PLANE, pp->pln_own, 1);
+
+ if (disp == 1 && from != 0 && !(plchr[pp->pln_type].pl_flags & P_M))
+ nreport(from, N_DOWN_PLANE, pp->pln_own, 1);
+ return disp;
+}
+
+/*
+ * NOTE: This routine may remove the appropriate plane element from the
+ * queue if it gets destroyed. That means that the caller must assume
+ * that the current queue pointer is invalid on return from the
+ * call. (this has caused bugs in the past)
+ */
+static void
+ac_putplane(struct plist *plp, int disp)
+{
+ if (disp)
pln_put1(plp);
- } else
- putplane(pp->pln_uid, pp);
- strcpy(mesg, dmess);
+ else
+ putplane(plp->plane.pln_uid, &plp->plane);
}
static void
gun = MIN(FLAK_GUN_MAX, from->sct_item[I_GUN]);
gun = roundavg(tfact(from->sct_own, 2.0 * gun));
if (gun > 0) {
- PR(plane_owner, "firing %d flak guns in %s...\n",
- gun, xyas(from->sct_x, from->sct_y, plane_owner));
- if (from->sct_own != 0)
- PR(from->sct_own, "firing %d flak guns in %s...\n",
- gun, xyas(from->sct_x, from->sct_y, from->sct_own));
+ mpr(plane_owner, "firing %d flak guns in %s...\n",
+ gun, xyas(from->sct_x, from->sct_y, plane_owner));
+ mpr(from->sct_own, "firing %d flak guns in %s...\n",
+ gun, xyas(from->sct_x, from->sct_y, from->sct_own));
ac_fireflak(list, from->sct_own, gun);
}
}
struct mchrstr *mcp;
double flak, total, ngun;
int gun;
- int rel;
struct plist *plp;
natid plane_owner;
natid from;
mcp = &mchr[(int)ship.shp_type];
if (mcp->m_flags & M_SUB)
continue;
- rel = getrel(getnatp(ship.shp_own), plane_owner);
- if (rel > HOSTILE)
+ if (relations_with(ship.shp_own, plane_owner) > HOSTILE)
continue;
gun = shp_usable_guns(&ship);
if (gun == 0)
ngun += flak;
total += techfact(ship.shp_tech, flak * 2.0);
- PR(ship.shp_own, "firing %.0f flak guns from %s...\n",
- flak, prship(&ship));
+ mpr(ship.shp_own, "firing %.0f flak guns from %s...\n",
+ flak, prship(&ship));
from = ship.shp_own;
}
gun = roundavg(total);
if (gun > 0) {
- PR(plane_owner, "Flak! Ships firing %d flak guns...\n", gun);
+ mpr(plane_owner, "Flak! Ships firing %d flak guns...\n", gun);
ac_fireflak(list, from, gun);
}
}
struct lchrstr *lcp;
double flak, total, ngun;
int aaf, gun;
- int rel;
struct plist *plp;
natid plane_owner;
natid from;
continue;
if (land.lnd_ship >= 0 || land.lnd_land >= 0)
continue;
- rel = getrel(getnatp(land.lnd_own), plane_owner);
- if (rel > HOSTILE)
+ if (relations_with(land.lnd_own, plane_owner) > HOSTILE)
continue;
flak = aaf * 1.5 * land.lnd_effic / 100.0;
ngun += flak;
total += techfact(land.lnd_tech, flak * 2.0);
- PR(land.lnd_own, "firing flak guns from unit %s (aa rating %d)\n",
- prland(&land), aaf);
+ mpr(land.lnd_own, "firing flak guns from unit %s (AA rating %d)\n",
+ prland(&land), aaf);
from = land.lnd_own;
}
gun = roundavg(total);
if (gun > 0) {
- PR(plane_owner, "Flak! Land units firing %d flak guns...\n", gun);
+ mpr(plane_owner, "Flak! Land units firing %d flak guns...\n", gun);
ac_fireflak(list, from, gun);
}
}
ac_fireflak(struct emp_qelem *list, natid from, int guns)
{
struct plist *plp;
- int n;
+ int n, disp;
struct emp_qelem *qp;
struct emp_qelem *next;
- char msg[255];
-
- plp = (struct plist *)list->q_forw;
+ char msg[14];
for (qp = list->q_forw; qp != list; qp = next) {
next = qp->q_forw;
plp = (struct plist *)qp;
n = ac_flak_dam(guns, pln_def(&plp->plane), plp->pcp->pl_flags);
- ac_planedamage(plp, from, n, 0, 2, 1, msg);
+ disp = ac_damage_plane(&plp->plane, from, n, 1, msg);
+ mpr(plp->plane.pln_own, " %s takes %d%s%s.\n",
+ prplane(&plp->plane), n, *msg ? " --" : "", msg);
+ ac_putplane(plp, disp);
}
}
flak = guns - def;
if ((pl_flags & P_T) == 0)
flak--;
- if (pl_flags & P_X)
- flak -= 2;
- if (pl_flags & P_H)
- flak -= 1;
if (flak > 8)
mult = flaktable[FLAK_MAX];
* Get planes available for interception duties.
*/
static void
-getilists(struct emp_qelem *list, unsigned char *rel, natid intruder)
+getilists(struct emp_qelem *list, enum relations rel[], natid intruder)
{
natid cn;
struct plchrstr *pcp;
rel[0] = NEUTRAL;
for (cn = 1; cn < MAXNOC; cn++) {
- rel[cn] = getrel(getnatp(cn), intruder);
+ rel[cn] = relations_with(cn, intruder);
emp_initque(&list[cn]);
}
continue;
if (plane.pln_effic < 40)
continue;
+ if (opt_MARKET) {
+ if (ontradingblock(EF_PLANE, &plane))
+ continue;
+ }
if (!pln_airbase_ok(&plane, 0, 0))
continue;
/* got one! */
ip = malloc(sizeof(*ip));
- ip->bombs = 0;
- ip->misc = 0;
+ ip->load = 0;
+ ip->pstage = PLG_HEALTHY;
ip->pcp = &plchr[(int)plane.pln_type];
ip->plane = plane;
emp_insque(&ip->queue, &list[plane.pln_own]);
projects / empserver / blobdiff