/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2014, 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/>.
*
* ---
*
- * See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- * related information and legal notices. It is expected that any future
- * projects/authors will amend these files as needed.
+ * See files README, COPYING and CREDITS in the root of the source
+ * tree for related information and legal notices. It is expected
+ * that future projects/authors will amend these files as needed.
*
* ---
*
* powe.c: Do a power report
- *
+ *
* Known contributors to this file:
* Dave Pare
* Ken Stevens, 1995
* Steve McClure, 1998-2000
+ * Markus Armbruster, 2004-2013
+ * Ron Koenderink, 2005-2008
*/
-#ifdef Rel4
-#include <string.h>
-#endif /* Rel4 */
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "sect.h"
-#include "nat.h"
-#include "ship.h"
-#include "land.h"
-#include "nuke.h"
-#include "power.h"
+#include <config.h>
+#include <unistd.h>
+#include <math.h>
+
+#include "commands.h"
#include "item.h"
-#include "deity.h"
-#include "plane.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
+#include "land.h"
#include "optlist.h"
-#include "commands.h"
-
-
-#include <fcntl.h>
-
-struct powsort {
- float powval;
- natid cnum;
-};
+#include "plane.h"
+#include "power.h"
+#include "ship.h"
-static int powcmp(struct powsort *p1, struct powsort *p2);
-static void out5(double value, int round_val, int round_flag);
-static void gen_power(void);
-static void addtopow(register int *vec, register struct powstr *pow);
+static void prpower(char *, struct powstr *, int);
+static void out5(double, int, int);
+static void gen_power(struct powstr *, int);
+static int powcmp(const void *, const void *);
+static void addtopow(short *, struct powstr *);
int
powe(void)
{
- struct natstr *natp;
- struct natstr *natp2;
- int round_flag;
- time_t pow_time;
- struct nstr_item ni;
- struct powstr pow;
- int num;
- int power_generated = 0;
- int targets[MAXNOC];
- int use_targets = 0;
- int got_targets = 0;
- int no_numbers = 0;
- s_char *p;
+ struct natstr *natp;
+ int i;
+ time_t pow_time;
+ struct nstr_item ni;
+ int save = 1;
+ int num = MAXNOC;
+ int power_generated = 0;
+ struct natstr nat;
+ struct powstr powbuf[MAXNOC];
+ int targets[MAXNOC];
+ int use_targets = 0;
+ int no_numbers = 0;
- bzero((s_char *)targets, sizeof(targets));
- natp = getnatp(player->cnum);
- num = MAXNOC;
- if (player->argp[1] && player->argp[1][0] == 'n') {
- if (natp->nat_btu < 1)
- pr("\n Insufficient BTUs, using the last report.\n\n");
- else {
- gen_power();
- power_generated = 1;
- if (player->argp[2] && (num = atoi(player->argp[2])) < 0) {
- num = MAXNOC;
- if (player->god)
- no_numbers = 1;
- else
- return RET_SYN;
- }
- }
- } else if (player->argp[1] && player->argp[1][0] == 'c') {
- if (!player->argp[2])
- return RET_SYN;
- if (strchr(player->argp[2], '/')) {
- p = strtok(player->argp[2], "/");
- do {
- got_targets |= set_target(p, targets);
- } while (NULL != (p = strtok(0, "/")));
- } else {
- got_targets |= set_target(player->argp[2], targets);
- }
- use_targets = 1;
- } else if (player->argp[1] && (num = atoi(player->argp[1])) < 0) {
- num = -(num);
- if (num > MAXNOC || num < 0)
- num = MAXNOC;
- if (player->god)
- no_numbers = 1;
- else
- return RET_SYN;
+ memset(targets, 0, sizeof(targets));
+
+ i = 1;
+ if (player->argp[1]) {
+ switch (player->argp[1][0]) {
+ case 'u':
+ if (player->god)
+ save = 0;
+ /* fall through */
+ case 'n':
+ i++;
+ natp = getnatp(player->cnum);
+ if (natp->nat_btu < 1)
+ pr("\n Insufficient BTUs, using the last report.\n\n");
+ else if (opt_AUTO_POWER && save)
+ pr("\n power new is disabled, using the last report.\n\n");
+ else {
+ gen_power(powbuf, save);
+ pow_time = time(NULL);
+ power_generated = 1;
+ }
}
+ }
- if (use_targets && !got_targets)
- return RET_FAIL;
+ if (player->argp[i]) {
+ if (player->argp[i][0] == 'c') {
+ if (!snxtitem(&ni, EF_NATION, player->argp[i + 1], NULL))
+ return RET_SYN;
+ while (nxtitem(&ni, &nat)) {
+ if (nat.nat_stat == STAT_UNUSED)
+ continue;
+ if (!player->god && nat.nat_stat != STAT_ACTIVE)
+ continue;
+ targets[nat.nat_cnum] = 1;
+ }
+ use_targets = 1;
+ } else
+ num = atoi(player->argp[i]);
+ }
- if (!power_generated) {
- snxtitem_all(&ni, EF_POWER);
- if (!nxtitem(&ni, (s_char *)&pow)) {
- pr("Power for this game has not been built yet. Type 'power new' to build it.\n");
- return RET_FAIL;
- }
- }
- pr(" - = [ Empire Power Report ] = -\n");
+ if (num < 0) {
+ if (!player->god)
+ return RET_SYN;
+ num = -num;
+ no_numbers = 1;
+ }
+
+ if (!power_generated) {
pow_time = ef_mtime(EF_POWER);
- pr(" as of %s\n sects eff civ", ctime(&pow_time));
- pr(" mil shell gun pet iron dust oil pln ship unit money\n");
snxtitem_all(&ni, EF_POWER);
- while ((nxtitem(&ni, (s_char *)&pow)) && num > 0) {
- if (pow.p_nation == 0 || pow.p_power <= 0.0)
- continue;
- if (opt_HIDDEN) {
- if (!player->god && pow.p_nation != player->cnum)
- continue;
- }
- natp2 = getnatp(pow.p_nation);
- if (natp2->nat_stat & STAT_GOD)
- continue;
- if (use_targets && !targets[pow.p_nation])
- continue;
- if (pow.p_nation != player->cnum && player->cnum != 0)
- round_flag = 1;
- else
- round_flag = 0;
- num--;
- pr("%9.9s", cname(pow.p_nation));
- out5(pow.p_sects, 5, round_flag);
- if (pow.p_sects) pr("%4.0f%%", pow.p_effic / pow.p_sects);
- else pr(" 0%%");
- out5(pow.p_civil, 50, round_flag);
- out5(pow.p_milit, 50, round_flag);
- out5(pow.p_shell, 25, round_flag);
- out5(pow.p_guns, 5, round_flag);
- out5(pow.p_petrol, 50, round_flag);
- out5(pow.p_iron, 50, round_flag);
- out5(pow.p_dust, 50, round_flag);
- out5(pow.p_oil, 50, round_flag);
- out5(pow.p_planes, 10, round_flag);
- out5(pow.p_ships, 10, round_flag);
- out5(pow.p_units, 10, round_flag);
- out5(pow.p_money, 5000, round_flag);
- pr("\n");
- if (player->god != 0 && !no_numbers)
- pr("%9.2f\n", pow.p_power);
+ if (!nxtitem(&ni, &powbuf[0])) {
+ pr("Power for this game has not been built yet.%s\n",
+ opt_AUTO_POWER ? "" : " Type 'power new' to build it.");
+ return RET_FAIL;
+ }
+ for (i = 1; i < MAXNOC; i++) {
+ if (!nxtitem(&ni, &powbuf[i])) {
+ CANT_REACH();
+ memset(&powbuf[i], 0, sizeof(powbuf[i]));
+ }
+ }
+ }
+
+ pr(" - = [ Empire Power Report ] = -\n");
+ pr(" as of %s\n sects eff civ", ctime(&pow_time));
+ pr(" mil shell gun pet iron dust oil pln ship unit money\n");
+ for (i = 1; i < MAXNOC && num > 0; i++) {
+ if (opt_HIDDEN) {
+ if (!player->god && powbuf[i].p_nation != player->cnum)
+ continue;
}
- if (((player->god != 0) && opt_HIDDEN) || !opt_HIDDEN) {
+ if (use_targets && !targets[powbuf[i].p_nation])
+ continue;
+ if (!use_targets && powbuf[i].p_power <= 0.0)
+ continue;
+ prpower(cname(powbuf[i].p_nation), &powbuf[i],
+ powbuf[i].p_nation != player->cnum && !player->god);
+ if (player->god && !no_numbers)
+ pr("%9.2f\n", powbuf[i].p_power);
+ num--;
+ }
+ if (!opt_HIDDEN || player->god) {
pr(" ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ----\n");
- getpower(0, &pow);
- pr("worldwide");
- out5(pow.p_sects, 5, 1);
- pr("%4.0f%%", pow.p_effic / (pow.p_sects + 0.1));
- out5(pow.p_civil, 50, 1);
- out5(pow.p_milit, 50, 1);
- out5(pow.p_shell, 25, 1);
- out5(pow.p_guns, 5, 1);
- out5(pow.p_petrol, 50, 1);
- out5(pow.p_iron, 50, 1);
- out5(pow.p_dust, 50, 1);
- out5(pow.p_oil, 50, 1);
- out5(pow.p_planes, 10, 1);
- out5(pow.p_ships, 10, 1);
- out5(pow.p_units, 10, 1);
- out5(pow.p_money, 5000, 1);
+ prpower("worldwide", &powbuf[0], !player->god);
pr("\n");
- }
- return RET_OK;
+ }
+ return RET_OK;
+}
+
+static void
+prpower(char *name, struct powstr *pow, int round_flag)
+{
+ pr("%9.9s", name);
+ out5(pow->p_sects, 5, round_flag);
+ if (pow->p_sects)
+ pr("%4.0f%%", pow->p_effic / pow->p_sects);
+ else
+ pr(" 0%%");
+ out5(pow->p_civil, 50, round_flag);
+ out5(pow->p_milit, 50, round_flag);
+ out5(pow->p_shell, 25, round_flag);
+ out5(pow->p_guns, 5, round_flag);
+ out5(pow->p_petrol, 50, round_flag);
+ out5(pow->p_iron, 50, round_flag);
+ out5(pow->p_dust, 50, round_flag);
+ out5(pow->p_oil, 50, round_flag);
+ out5(pow->p_planes, 10, round_flag);
+ out5(pow->p_ships, 10, round_flag);
+ out5(pow->p_units, 10, round_flag);
+ out5(pow->p_money, 5000, round_flag);
+ pr("\n");
}
static void
out5(double value, int round_val, int round_flag)
{
- if (value > round_val && round_flag)
- value = (int) (value / round_val + 0.5) * round_val;
- if (value < -995000.)
- pr("%4.0fM", value / 1e6);
- else if (value < -9950.)
- pr("%4.0fK", value / 1000.);
- else if (value < -999.)
- pr("%4.1fK", value / 1000.);
- else if (value < 1000.)
- pr("%4.0f ", value);
- else if (value < 10000.)
- pr("%4.1fK", value / 1000.);
- else if (value < 1e6)
- pr("%4.0fK", value / 1000.);
- else if (value < 1e7)
- pr("%4.1fM", value / 1e6);
- else if (value >= 1e9)
- pr("%4.0fG", value / 1e9);
- else
- pr("%4.0fM", value / 1e6);
+ double aval;
+
+ if (value > round_val && round_flag)
+ value = (int)(value / round_val + 0.5) * round_val;
+ aval = fabs(value);
+ if (aval < 1000.)
+ pr("%4.0f ", value);
+ else if (aval < 9.95e3)
+ pr("%4.1fK", value / 1e3);
+ else if (aval < 999.5e3)
+ pr("%4.0fK", value / 1e3);
+ else if (aval < 9.95e6)
+ pr("%4.1fM", value / 1e6);
+ else if (aval < 999.5e6)
+ pr("%4.0fM", value / 1e6);
+ else
+ pr("%4.0fG", value / 1e9);
+}
+
+void
+update_power(void)
+{
+ struct powstr powbuf[MAXNOC];
+
+ gen_power(powbuf, 1);
}
static void
-gen_power(void)
+gen_power(struct powstr *powbuf, int save)
{
- extern double powe_cost;
- float *f_ptr;
- float *f_pt2;
- register struct powstr *pow;
- register int i;
- struct sctstr sect;
- struct plnstr plane;
- struct shpstr ship;
- struct lndstr land;
- struct powstr powbuf[MAXNOC];
- struct nstr_item ni;
- struct nstr_sect ns;
- int vec[I_MAX+1];
- struct powsort order[MAXNOC];
- struct natstr *natp;
- float f;
+ float *f_ptr;
+ float *f_pt2;
+ struct powstr *pow;
+ int i;
+ struct sctstr sect;
+ struct plnstr plane;
+ struct shpstr ship;
+ struct lndstr land;
+ struct nstr_item ni;
+ struct nstr_sect ns;
+ struct natstr *natp;
+ float f;
- player->btused += powe_cost;
- bzero((s_char *) powbuf, sizeof(powbuf));
- snxtsct_all(&ns);
- while (nxtsct(&ns, §)) {
- if (sect.sct_own == 0)
- continue;
- pow = &powbuf[sect.sct_own];
- pow->p_sects += 1.0;
- pow->p_effic += sect.sct_effic;
- getvec(VT_ITEM, vec, (s_char *)§, EF_SECTOR);
- addtopow(vec, pow);
- }
- snxtitem_all(&ni, EF_LAND);
- while (nxtitem(&ni, (s_char *)&land)) {
- if (land.lnd_own == 0)
- continue;
- pow = &powbuf[land.lnd_own];
- getvec(VT_ITEM, vec, (s_char *)&land, EF_LAND);
- addtopow(vec, pow);
- if (opt_NEWPOWER == 0) {
- pow->p_power += lchr[(int)land.lnd_type].l_lcm / 10.0;
- pow->p_power += lchr[(int)land.lnd_type].l_hcm / 5.0;
- } else { /* old power */
- f = ((float)(lchr[(int)land.lnd_type].l_lcm / 10.0)) *
- ((float)land.lnd_effic)/100.0;
- f += ((float)(lchr[(int)land.lnd_type].l_hcm / 10.0)) *
- ((float)land.lnd_effic/100.0);
- pow->p_power += f*2;
- } /* end NEWPOWER */
- pow->p_units += 1.0;
+ player->btused += 10;
+ memset(powbuf, 0, MAXNOC * sizeof(*powbuf));
+ snxtsct_all(&ns);
+ while (nxtsct(&ns, §)) {
+ if (sect.sct_own == 0)
+ continue;
+ pow = &powbuf[sect.sct_own];
+ pow->p_sects += 1.0;
+ pow->p_effic += sect.sct_effic;
+ addtopow(sect.sct_item, pow);
+ }
+ snxtitem_all(&ni, EF_LAND);
+ while (nxtitem(&ni, &land)) {
+ if (land.lnd_own == 0)
+ continue;
+ pow = &powbuf[land.lnd_own];
+ addtopow(land.lnd_item, pow);
+ f = (lchr[(int)land.lnd_type].l_lcm / 10.0) * (land.lnd_effic / 100.0);
+ f += (lchr[(int)land.lnd_type].l_hcm / 10.0) * (land.lnd_effic / 100.0);
+ pow->p_power += f * 2;
+ if (!(lchr[(int)land.lnd_type].l_flags & L_SPY))
+ pow->p_units += 1.0;
+ }
+ snxtitem_all(&ni, EF_SHIP);
+ while (nxtitem(&ni, &ship)) {
+ if (ship.shp_own == 0)
+ continue;
+ pow = &powbuf[ship.shp_own];
+ addtopow(ship.shp_item, pow);
+ f = (mchr[(int)ship.shp_type].m_lcm / 10.0) * (ship.shp_effic / 100.0);
+ f += (mchr[(int)ship.shp_type].m_hcm / 10.0) * (ship.shp_effic / 100.0);
+ pow->p_power += f * 2;
+ pow->p_ships += 1.0;
+ }
+ snxtitem_all(&ni, EF_PLANE);
+ while (nxtitem(&ni, &plane)) {
+ if (plane.pln_own == 0)
+ continue;
+ pow = &powbuf[plane.pln_own];
+ pow->p_planes += 1.0;
+ natp = getnatp(plane.pln_own);
+ pow->p_power += 20 * (plane.pln_effic / 100.0) *
+ (natp->nat_level[NAT_TLEV] / 500.0);
+ }
+ for (i = 1; NULL != (natp = getnatp(i)); i++) {
+ pow = &powbuf[i];
+ pow->p_nation = i;
+ if (natp->nat_stat != STAT_ACTIVE) {
+ pow->p_power = 0.;
+ continue;
}
- snxtitem_all(&ni, EF_SHIP);
- while (nxtitem(&ni, (s_char *)&ship)) {
- if (ship.shp_own == 0)
- continue;
- pow = &powbuf[ship.shp_own];
- getvec(VT_ITEM, vec, (s_char *)&ship, EF_SHIP);
- addtopow(vec, pow);
- if (opt_NEWPOWER == 0) {
- pow->p_power += mchr[(int)ship.shp_type].m_lcm / 10.0;
- pow->p_power += mchr[(int)ship.shp_type].m_hcm / 5.0;
- } else { /* old power formula */
- f = ((float)(mchr[(int)ship.shp_type].m_lcm / 10.0)) *
- ((float)ship.shp_effic)/100.0;
- f += ((float)(mchr[(int)ship.shp_type].m_hcm / 10.0)) *
- ((float)ship.shp_effic/100.0);
- pow->p_power += f*2;
- } /* end NEWPOWER */
- pow->p_ships += 1.0;
- }
- snxtitem_all(&ni, EF_PLANE);
- while (nxtitem(&ni, (s_char *)&plane)) {
- if (plane.pln_own == 0)
- continue;
- pow = &powbuf[plane.pln_own];
- pow->p_planes += 1.0;
- if (opt_NEWPOWER == 0)
- pow->p_power += plane.pln_effic / 100.0;
- else { /* old POWER */
- natp=getnatp(plane.pln_own);
- pow->p_power += 20 * (plane.pln_effic / 100.0) *
- (natp->nat_level[NAT_TLEV]/500.0);
- } /* end old POWER */
- }
- for (i=1; NULL != (natp = getnatp(i)); i++) {
- pow = &powbuf[i];
- pow->p_nation = i;
- if ((natp->nat_stat & STAT_INUSE) == 0 ||
- (natp->nat_stat & STAT_NORM) == 0) {
- pow->p_power = 0.;
- continue;
- }
- if (opt_NEWPOWER && (natp->nat_stat & STAT_GOD)) {
- pow->p_power = 0.;
- continue;
- }
- pow->p_money = natp->nat_money;
- pow->p_power += pow->p_money / 100.;
+ pow->p_money = natp->nat_money;
+ pow->p_power += pow->p_money / 100.;
- pow->p_power += pow->p_petrol / (opt_NEWPOWER ? 500.0 : 50.0);
+ pow->p_power += pow->p_petrol / 500.0;
- if (opt_NEWPOWER == 0) {
- pow->p_power += (pow->p_civil + pow->p_milit +
- pow->p_shell) / 10.;
- pow->p_power += (pow->p_iron + pow->p_dust +
- pow->p_effic + pow->p_oil) / 10.;
- pow->p_power += (pow->p_guns + pow->p_effic) / 3.;
- pow->p_power += pow->p_ships;
- pow->p_power += pow->p_sects * 3.0;
- pow->p_power += pow->p_planes * 5.0;
- } else { /* new POWER format */
- pow->p_power += (pow->p_civil + pow->p_milit)/10.0;
- pow->p_power += (pow->p_shell)/12.5;
- pow->p_power += (pow->p_iron)/100.0;
- pow->p_power += (pow->p_dust/5 +
- pow->p_oil/10 +
- pow->p_bars);
- pow->p_power += (pow->p_guns) / 2.5;
- if (pow->p_sects > 0)
- pow->p_power += (pow->p_sects *
- ((pow->p_effic/pow->p_sects)/
- 100.0)) * 10.0;
- if (natp->nat_level[NAT_TLEV] > 0.0)
- pow->p_power = pow->p_power *
- (((float)natp->nat_level[NAT_TLEV])/
- 500.0);
- else
- pow->p_power = pow->p_power * (1.0/500.0);
- } /* end new POWER */
- /* ack. add this vec to the "world power" element */
- f_pt2 = &(powbuf[0].p_sects);
- f_ptr = &(pow->p_sects);
- while (f_ptr <= &(pow->p_power)) {
- *f_pt2 += *f_ptr;
- f_pt2++;
- f_ptr++;
- }
+ pow->p_power += (pow->p_civil + pow->p_milit) / 10.0;
+ pow->p_power += pow->p_shell / 12.5;
+ pow->p_power += pow->p_iron / 100.0;
+ pow->p_power += pow->p_dust / 5 + pow->p_oil / 10 + pow->p_bars;
+ pow->p_power += pow->p_guns / 2.5;
+ if (pow->p_sects > 0)
+ pow->p_power += pow->p_sects
+ * (pow->p_effic / pow->p_sects / 100.0)
+ * 10.0;
+ pow->p_power *= MAX(1.0, natp->nat_level[NAT_TLEV]) / 500.0;
+ /* ack. add this vec to the "world power" element */
+ f_pt2 = &powbuf[0].p_sects;
+ f_ptr = &pow->p_sects;
+ while (f_ptr <= &pow->p_power) {
+ *f_pt2 += *f_ptr;
+ f_pt2++;
+ f_ptr++;
}
- for (i=1; i < MAXNOC; i++) {
- struct natstr *np;
- int maxpop;
- float f = 1.0;
+ }
+ for (i = 1; i < MAXNOC; i++) {
+ struct natstr *np;
+ int maxpop;
- if (opt_RES_POP) {
- np = getnatp(i);
- maxpop = max_pop(np->nat_level[NAT_RLEV], 0);
- f = 1.0 + (((float)maxpop)/10000.0);
- }
- powbuf[i].p_power *= f;
- order[i].powval = powbuf[i].p_power;
- order[i].cnum = i;
- }
- qsort((s_char *)&order[1], MAXNOC-1, sizeof(*order), (qsort_func_t)powcmp);
- putpower(0, &powbuf[0]);
- for (i=1; i<MAXNOC; i++) {
- putpower(i, &powbuf[order[i].cnum]);
+ if (opt_RES_POP) {
+ np = getnatp(i);
+ maxpop = max_population(np->nat_level[NAT_RLEV], SCT_MINE, 0);
+ powbuf[i].p_power *= 1.0 + maxpop / 10000.0;
}
+ }
+ qsort(&powbuf[1], MAXNOC - 1, sizeof(*powbuf), powcmp);
+ if (!save)
+ return;
+ for (i = 0; i < MAXNOC; i++)
+ putpower(i, &powbuf[i]);
+#ifdef _WIN32
+ /*
+ * At least some versions of Windows fail to update mtime on
+ * write(), they delay it until the write actually hits the disk.
+ * Bad, because `power' displays that time. Force it.
+ */
+ _commit(empfile[EF_POWER].fd);
+#endif
}
static int
-powcmp(struct powsort *p1, struct powsort *p2)
+powcmp(const void *a, const void *b)
{
- if (p1->powval > p2->powval)
- return -1;
- if (p1->powval < p2->powval)
- return 1;
- return 0;
-}
+ const struct powstr *p1 = a;
+ const struct powstr *p2 = b;
-static void
-addtopow(register int *vec, register struct powstr *pow)
-{
- pow->p_civil += vec[I_CIVIL];
- pow->p_milit += vec[I_MILIT];
- pow->p_shell += vec[I_SHELL];
- pow->p_guns += vec[I_GUN];
- pow->p_petrol += vec[I_PETROL];
- pow->p_iron += vec[I_IRON];
- pow->p_dust += vec[I_DUST];
- pow->p_food += vec[I_FOOD];
- pow->p_oil += vec[I_OIL];
- pow->p_bars += vec[I_BAR];
- pow->p_power += vec[I_LCM] / 10.0;
- pow->p_power += vec[I_HCM] / 5.0;
+ if (p1->p_power > p2->p_power)
+ return -1;
+ if (p1->p_power < p2->p_power)
+ return 1;
+ return p1->p_nation - p2->p_nation;
}
-int
-set_target(s_char *p, int *targets)
+static void
+addtopow(short *vec, struct powstr *pow)
{
- int target;
- struct natstr *natp;
-
- if (!p)
- return 0;
-
- if (isdigit(*p))
- target = atoi(p);
- else
- target = cnumb(p);
-
- if (target > 0 && target < MAXNOC && (natp = getnatp(target))) {
- if (natp->nat_stat & STAT_GOD) {
- pr("Country #%d is a deity country\n", target);
- } else if (!(natp->nat_stat & STAT_INUSE)) {
- pr("Country #%d is not in use\n", target);
- } else if (!(natp->nat_stat & STAT_NORM)) {
- pr("Country #%d is not a normal country\n", target);
- } else {
- targets[target] = 1;
- return 1;
- }
- } else
- pr("Bad country: \'%s\'\n", p);
-
- return 0;
+ pow->p_civil += vec[I_CIVIL];
+ pow->p_milit += vec[I_MILIT];
+ pow->p_shell += vec[I_SHELL];
+ pow->p_guns += vec[I_GUN];
+ pow->p_petrol += vec[I_PETROL];
+ pow->p_iron += vec[I_IRON];
+ pow->p_dust += vec[I_DUST];
+ pow->p_food += vec[I_FOOD];
+ pow->p_oil += vec[I_OIL];
+ pow->p_bars += vec[I_BAR];
+ pow->p_power += vec[I_LCM] / 10.0;
+ pow->p_power += vec[I_HCM] / 5.0;
}