/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
*
* ---
*
- * 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.
*
* ---
*
* star.c: Do a starvation report
- *
+ *
* Known contributors to this file:
- *
+ *
*/
#include <config.h>
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "sect.h"
-#include "nsc.h"
-#include "nat.h"
-#include "path.h"
-#include "file.h"
+#include <math.h>
+#include "commands.h"
#include "item.h"
-#include "ship.h"
-#include "optlist.h"
#include "land.h"
-#include "commands.h"
+#include "optlist.h"
+#include "path.h"
+#include "ship.h"
-static void starv_sects(s_char *range);
-static void starv_ships(s_char *range);
-static void starv_units(s_char *range);
+static void starv_sects(char *range);
+static void starv_ships(char *range);
+static void starv_units(char *range);
static void sect_hdr(void);
static void ship_hdr(void);
static void unit_hdr(void);
int
starve(void)
{
- struct nstr_sect nstr;
int do_sects = 0;
int do_ships = 0;
int do_units = 0;
- s_char range[1024];
+ char *range;
if (opt_NOFOOD) { /* no food - no work! */
pr("No food is required in this game\n");
return RET_OK;
}
- strcpy(range, "*");
+ range = "*";
if (!player->argp[1]) {
do_sects = do_ships = do_units = 1;
} else if (*(player->argp[1]) == 's') {
do_ships = 1;
if (player->argp[2])
- strcpy(range, player->argp[2]);
+ range = player->argp[2];
} else if (*(player->argp[1]) == 'l') {
do_units = 1;
if (player->argp[2])
- strcpy(range, player->argp[2]);
+ range = player->argp[2];
} else {
- if (!snxtsct(&nstr, player->argp[1]))
- return RET_SYN;
do_sects = 1;
- strcpy(range, player->argp[1]);
+ range = player->argp[1];
}
player->simulation = 1;
prdate();
}
static void
-starv_sects(s_char *range)
+starv_people(short *vec, int victims)
+{
+ pr(" will starve %d people. %.0f more food needed\n", victims,
+ ceil(food_needed(vec, etu_per_update) - vec[I_FOOD]));
+}
+
+static void
+starv_sects(char *range)
{
struct nstr_sect nstr;
struct sctstr sect;
int nsect = 0;
- int s, needed;
+ int s, save;
if (!snxtsct(&nstr, range))
return;
if (sect.sct_type == SCT_SANCT)
continue;
-/* This next 2 lines were added to overcompensate for the needy */
- if (sect.sct_item[I_FOOD])
- sect.sct_item[I_FOOD]--;
- s = feed_people(sect.sct_item, etu_per_update, &needed);
-
+ /*
+ * Check for starvation. Suppress complaints about tiny
+ * population without food by adding 1f just for the check.
+ * That's okay because growfood() will grow at least that much
+ * anyway.
+ */
+ save = sect.sct_item[I_FOOD];
+ if (sect.sct_item[I_FOOD] == 0)
+ sect.sct_item[I_FOOD] = 1;
+ s = famine_victims(sect.sct_item, etu_per_update);
+ sect.sct_item[I_FOOD] = save;
if (s == 0)
continue;
+
if (nsect++ == 0)
sect_hdr();
if (player->god)
pr("%3d ", sect.sct_own);
prxy("%4d,%-4d", nstr.x, nstr.y, player->cnum);
pr(" %c", dchr[sect.sct_type].d_mnem);
- pr(" %c", (sect.sct_own != sect.sct_oldown ? '*' : ' '));
+ pr(" %c", sect.sct_own != sect.sct_oldown ? '*' : ' ');
if (sect.sct_newtype != sect.sct_type)
pr("%c", dchr[sect.sct_newtype].d_mnem);
else
pr(" ");
pr("%4d%%", sect.sct_effic);
- pr(" will starve %d people. %d more food needed\n", s, needed);
+ starv_people(sect.sct_item, s);
}
if (nsect == 0) {
if (player->argp[1])
}
static void
-starv_ships(s_char *range)
+starv_ships(char *range)
{
struct nstr_item ni;
struct shpstr ship;
int nship = 0;
- int s, needed;
+ int s;
- if (!snxtitem(&ni, EF_SHIP, range))
+ if (!snxtitem(&ni, EF_SHIP, range, NULL))
return;
while (nxtitem(&ni, &ship)) {
if (!player->owner || !ship.shp_own)
continue;
- s = feed_ship(&ship, etu_per_update, &needed, 0);
+ s = famine_victims(ship.shp_item, etu_per_update);
if (s == 0)
continue;
if (nship++ == 0)
pr("%3d ", ship.shp_own);
pr("%5d ", ship.shp_uid);
pr("%-16.16s ", mchr[(int)ship.shp_type].m_name);
- pr(" will starve %d people. %d more food needed\n", s, needed);
+ starv_people(ship.shp_item, s);
}
if (nship == 0) {
if (range)
}
static void
-starv_units(s_char *range)
+starv_units(char *range)
{
struct nstr_item ni;
struct lndstr land;
int nunit = 0;
- int s, needed;
+ int s;
- if (!snxtitem(&ni, EF_LAND, range))
+ if (!snxtitem(&ni, EF_LAND, range, NULL))
return;
while (nxtitem(&ni, &land)) {
if (!player->owner || !land.lnd_own)
continue;
- s = feed_land(&land, etu_per_update, &needed, 0);
+ s = famine_victims(land.lnd_item, etu_per_update);
if (s == 0)
continue;
if (nunit++ == 0)
pr("%3d ", land.lnd_own);
pr("%5d ", land.lnd_uid);
pr("%-16.16s ", lchr[(int)land.lnd_type].l_name);
- pr(" will starve %d mil. %d more food needed\n", s, needed);
+ starv_people(land.lnd_item, s);
}
if (nunit == 0) {
if (range)
projects / empserver / blobdiff