/*
* 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-2017, 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/>.
*
* ---
*
* ---
*
* upgr.c: Upgrade tech of ships/planes/units
- *
+ *
* Known contributors to this file:
* Dave Pare, 1986
* Steve McClure, 1996-2000
+ * Markus Armbruster, 2004-2016
*/
#include <config.h>
#include "ship.h"
enum {
- UPGR_COST = 15, /* how much avail and money to charge */
- UPGR_EFF = 35 /* efficiency reduction */
+ UPGR_COST = 15, /* how much avail and money to charge */
+ UPGR_EFF = 35 /* efficiency reduction */
};
static int lupgr(void);
int n;
int tlev;
int avail, cost;
- int rel;
- long cash;
+ int cash;
- if (!snxtitem(&ni, EF_LAND, player->argp[2]))
+ if (!snxtitem(&ni, EF_LAND, player->argp[2], NULL))
return RET_SYN;
natp = getnatp(player->cnum);
cash = natp->nat_money;
continue;
if (sect.sct_type != SCT_HEADQ || sect.sct_effic < 60)
continue;
- rel = getrel(getnatp(land.lnd_own), sect.sct_own);
- if (rel < FRIENDLY && sect.sct_own != land.lnd_own) {
+ if (relations_with(land.lnd_own, sect.sct_own) < FRIENDLY) {
pr("You are not on friendly terms with the owner of unit %d!\n",
land.lnd_uid);
continue;
}
n++;
lp = &lchr[(int)land.lnd_type];
- avail = (LND_BLD_WORK(lp->l_lcm, lp->l_hcm) * UPGR_COST + 99) / 100;
+ avail = (lp->l_bwork * UPGR_COST + 99) / 100;
if (sect.sct_avail < avail) {
pr("Not enough available work in %s to upgrade a %s\n",
xyas(sect.sct_x, sect.sct_y, player->cnum), lp->l_name);
if (land.lnd_own != player->cnum)
wu(0, land.lnd_own,
"%s upgraded by %s to tech %d, at a cost of %d\n",
- prland(&land), cname(player->cnum), land.lnd_tech,
- cost);
+ prland(&land), cname(player->cnum), land.lnd_tech, cost);
}
if (n == 0) {
pr("No land units\n");
int n;
int tlev;
int avail, cost;
- int rel;
- long cash;
+ int cash;
- if (!snxtitem(&ni, EF_SHIP, player->argp[2]))
+ if (!snxtitem(&ni, EF_SHIP, player->argp[2], NULL))
return RET_SYN;
natp = getnatp(player->cnum);
cash = natp->nat_money;
continue;
if (sect.sct_type != SCT_HARBR || sect.sct_effic < 60)
continue;
- rel = getrel(getnatp(ship.shp_own), sect.sct_own);
- if (rel < FRIENDLY && sect.sct_own != ship.shp_own) {
+ if (relations_with(ship.shp_own, sect.sct_own) < FRIENDLY) {
pr("You are not on friendly terms with the owner of ship %d!\n",
ship.shp_uid);
continue;
}
n++;
mp = &mchr[(int)ship.shp_type];
- avail = (SHP_BLD_WORK(mp->m_lcm, mp->m_hcm) * UPGR_COST + 99) / 100;
+ avail = (mp->m_bwork * UPGR_COST + 99) / 100;
if (sect.sct_avail < avail) {
pr("Not enough available work in %s to upgrade a %s\n",
xyas(sect.sct_x, sect.sct_y, player->cnum), mp->m_name);
if (ship.shp_own != player->cnum)
wu(0, ship.shp_own,
"%s upgraded by %s to tech %d, at a cost of %d\n",
- prship(&ship), cname(player->cnum), ship.shp_tech,
- cost);
+ prship(&ship), cname(player->cnum), ship.shp_tech, cost);
}
if (n == 0) {
pr("No ships\n");
int n;
int tlev;
int avail, cost;
- int rel;
- long cash;
+ int cash;
- if (!snxtitem(&ni, EF_PLANE, player->argp[2]))
+ if (!snxtitem(&ni, EF_PLANE, player->argp[2], NULL))
return RET_SYN;
natp = getnatp(player->cnum);
cash = natp->nat_money;
continue;
if (sect.sct_type != SCT_AIRPT || sect.sct_effic < 60)
continue;
- rel = getrel(getnatp(plane.pln_own), sect.sct_own);
- if (rel < FRIENDLY && sect.sct_own != plane.pln_own) {
+ if (relations_with(plane.pln_own, sect.sct_own) < FRIENDLY) {
pr("You are not on friendly terms with the owner of plane %d!\n",
plane.pln_uid);
continue;
continue;
n++;
pp = &plchr[(int)plane.pln_type];
- avail = (PLN_BLD_WORK(pp->pl_lcm, pp->pl_hcm) * UPGR_COST + 99) / 100;
+ avail = (pp->pl_bwork * UPGR_COST + 99) / 100;
if (sect.sct_avail < avail) {
pr("Not enough available work in %s to upgrade a %s\n",
xyas(sect.sct_x, sect.sct_y, player->cnum), pp->pl_name);
if (plane.pln_own != player->cnum)
wu(0, plane.pln_own,
"%s upgraded by %s to tech %d, at a cost of %d\n",
- prplane(&plane), cname(player->cnum), plane.pln_tech,
- cost);
+ prplane(&plane), cname(player->cnum), plane.pln_tech, cost);
}
if (n == 0) {
pr("No planes.\n");
projects / empserver / blobdiff