/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure, Markus Armbruster
*
* Empire is free software: you can redistribute it and/or modify
* Dave Pare, 1986
* Ken Stevens, 1995
* Steve McClure, 1998-2000
- * Markus Armbruster, 2004-2016
+ * Markus Armbruster, 2004-2021
*/
#include <config.h>
#include "chance.h"
#include "empobj.h"
-#include "file.h"
#include "item.h"
#include "land.h"
#include "map.h"
/* over own or allied ship is fine */
snxtitem_xy(&ni, EF_SHIP, x, y);
while (nxtitem(&ni, &ship)) {
- if (ship.shp_effic < SHIP_MINEFF || ship.shp_own == 0)
+ if (!ship.shp_own)
continue;
if (relations_with(ship.shp_own, player->cnum) == ALLIED)
return ap_sect;
if (amt > 0) {
getsect(tx, ty, §);
if (sect.sct_type != SCT_WATER) {
- pr("Your seamines have no effect here.\n");
+ pr("Your sea mines have no effect here.\n");
return;
}
sect.sct_mines = MIN(sect.sct_mines + amt, MINES_MAX);
continue;
if (opt_MARKET) {
if (ontradingblock(EF_PLANE, &plane)) {
- pr("plane #%d inelligible - it's for sale.\n",
+ pr("plane #%d ineligible - it's for sale.\n",
plane.pln_uid);
continue;
}
case 'e': /* escort */
load = 0;
break;
- case 'i': /* missile interception */
- if (CANT_HAPPEN(!(pcp->pl_flags & P_M)
- || !(pcp->pl_flags & (P_N | P_O))))
- break;
- if (load)
- itype = I_SHELL;
- break;
default:
CANT_REACH();
load = 0;
/* We should do more, like make sure it's really
a carrier, etc. but for now just make sure it's
not sunk. */
- if (ship.shp_effic < SHIP_MINEFF) {
+ if (!ship.shp_own) {
mpr(pp->pln_own,
"Ship #%d has been sunk, plane #%d has nowhere to land, and\n"
"splashes into the sea.\n",
aim = 100 - aim;
}
- len = snprintf(buf, sizeof(buf), "%s", noisy);
+ len = noisy ? snprintf(buf, sizeof(buf), "%s", noisy) : 0;
while (i--) {
if (noisy) {
if (len > 75) {