/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2015, 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/>.
*
* ---
*
* ---
*
* budg.c: Calculate production levels, prioritize
- *
+ *
* Known contributors to this file:
* Thomas Ruschak, 1992
* Ville Virrankoski, 1995
* Steve McClure, 1997-2000
- * Markus Armbruster, 2004-2006
+ * Markus Armbruster, 2004-2013
*/
#include <config.h>
-#include <string.h>
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "nsc.h"
-#include "sect.h"
-#include "product.h"
-#include "nat.h"
-#include "item.h"
-#include "file.h"
-#include "ship.h"
-#include "land.h"
-#include "plane.h"
-#include "optlist.h"
+#include <ctype.h>
#include "budg.h"
#include "commands.h"
+#include "item.h"
+#include "optlist.h"
+#include "product.h"
-static void calc_all(long (*p_sect)[2], int *taxes, int *Ncivs,
+static void calc_all(int (*p_sect)[2], int *taxes, int *Ncivs,
int *Nuws, int *bars, int *Nbars, int *mil,
int *ships, int *sbuild, int *nsbuild, int *smaint,
int *units, int *lbuild, int *nlbuild, int *lmaint,
int
budg(void)
{
- int i, res;
- long p_sect[SCT_MAXDEF+1][2];
+ int i;
+ int p_sect[SCT_BUDG_MAX+1][2];
int taxes, Ncivs, Nuws, bars, Nbars, mil;
int ships, sbuild, nsbuild, smaint;
int units, lbuild, nlbuild, lmaint;
income = taxes + bars;
expenses = 0;
pr("Sector Type\t\t\tProduction\t\t\t Cost\n");
- for (i = 0; i <= SCT_MAXDEF; i++) {
- if (!p_sect[i][1] || i == SCT_CAPIT)
+ for (i = 0; i <= SCT_TYPE_MAX; i++) {
+ if (!p_sect[i][1])
continue;
pr("%-17s\t\t", dchr[i].d_name);
if (i == SCT_ENLIST)
- pr("%ld mil \t", p_sect[i][0]);
- else if (pchr[dchr[i].d_prd].p_cost != 0)
- pr("%ld %-7s\t", p_sect[i][0], pchr[dchr[i].d_prd].p_sname);
+ pr("%d mil \t", p_sect[i][0]);
+ else if (dchr[i].d_prd >= 0)
+ pr("%d %-7s\t", p_sect[i][0], pchr[dchr[i].d_prd].p_sname);
else
pr("\t\t");
- pr("\t\t%8ld\n", p_sect[i][1]);
+ pr("\t\t%8d\n", p_sect[i][1]);
expenses += p_sect[i][1];
}
}
if (p_sect[SCT_EFFIC][1]) {
- pr("Sector building\t\t\t\t%8ld sct(s)\t\t%8ld\n",
- p_sect[SCT_EFFIC][0], p_sect[SCT_EFFIC][1]);
+ sprintf(buf, "%d sector%s",
+ p_sect[SCT_EFFIC][0], splur(p_sect[SCT_EFFIC][0]));
+ pr("Sector building\t\t\t%-16s\t\t%8d\n",
+ buf, p_sect[SCT_EFFIC][1]);
expenses += p_sect[SCT_EFFIC][1];
}
+ if (p_sect[SCT_MAINT][0]) {
+ sprintf(buf, "%d sector%s",
+ p_sect[SCT_MAINT][0], splur(p_sect[SCT_MAINT][0]));
+ pr("Sector maintenance\t\t%-16s\t\t%8d\n",
+ buf, p_sect[SCT_MAINT][1]);
+ expenses += p_sect[SCT_MAINT][1];
+ }
if (mil) {
n = (mil - np->nat_reserve * money_res * etu) / (etu * money_mil);
- sprintf(in, "%d mil, %d res", n, (int)np->nat_reserve);
+ sprintf(in, "%d mil, %d res", n, np->nat_reserve);
pr("Military payroll\t\t%-32s%8d\n", in, -mil);
expenses -= mil;
}
- if (p_sect[SCT_CAPIT][0]) {
- pr("%c%s maintenance\t\t",
- toupper(dchr[SCT_CAPIT].d_name[0]),
- dchr[SCT_CAPIT].d_name + 1);
- n = p_sect[SCT_CAPIT][0];
- sprintf(in, "%d %s", n, dchr[SCT_CAPIT].d_name);
- plurize(in, sizeof(in), n);
- pr("%-32s%8ld\n", in, p_sect[SCT_CAPIT][1]);
- expenses += p_sect[SCT_CAPIT][1];
- }
pr("Total expenses%s\n", dotsprintf(buf, "%58d", expenses));
if (taxes) {
sprintf(in, "%d civ%s, %d uw%s",
pr("Income from bars\t\t%-32s%+8d\n", in, bars);
}
pr("Total income%s\n", dotsprintf(buf, "%+60d", income));
- pr("Balance forward\t\t\t\t\t\t %10ld\n", np->nat_money);
+ pr("Balance forward\t\t\t\t\t\t %10d\n", np->nat_money);
pr("Estimated delta\t\t\t\t\t\t %+10d\n", income - expenses);
pr("Estimated new treasury%s\n",
dotsprintf(buf, "%50d", np->nat_money + income - expenses));
- if (((np->nat_money + income - expenses) < 0) && !player->god) {
+ if (np->nat_money + income - expenses < 0 && !player->god) {
pr("After processsing sectors, you will be broke!\n");
pr("Sectors will not produce, distribute, or deliver!\n\n");
}
}
static void
-calc_all(long p_sect[][2],
+calc_all(int p_sect[][2],
int *taxes, int *Ncivs, int *Nuws, int *bars, int *Nbars, int *mil,
int *ships, int *sbuild, int *nsbuild, int *smaint,
int *units, int *lbuild, int *nlbuild, int *lmaint,
int *planes, int *pbuild, int *npbuild, int *pmaint)
{
- int y, z;
struct natstr *np;
- int *bp;
- long pop = 0;
+ struct bp *bp;
+ int pop = 0;
int n, civ_tax, uw_tax, mil_pay;
struct sctstr *sp;
int etu = etu_per_update;
- mil_dbl_pay = 0;
- memset(p_sect, 0, sizeof(**p_sect) * (SCT_MAXDEF+1) * 2);
+ memset(p_sect, 0, sizeof(**p_sect) * (SCT_BUDG_MAX+1) * 2);
*taxes = *Ncivs = *Nuws = *bars = *Nbars = *mil = 0;
*ships = *sbuild = *nsbuild = *smaint = 0;
*units = *lbuild = *nlbuild = *lmaint = 0;
*planes = *pbuild = *npbuild = *pmaint = 0;
-
+
np = getnatp(player->cnum);
- bp = calloc(WORLD_X * WORLD_Y * 8, sizeof(int));
+ bp = bp_alloc();
for (n = 0; NULL != (sp = getsectid(n)); n++) {
- fill_update_array(bp, sp);
+ bp_set_from_sect(bp, sp);
if (sp->sct_own == player->cnum) {
sp->sct_updated = 0;
tax(sp, np, etu, &pop, &civ_tax, &uw_tax, &mil_pay);
*mil += upd_slmilcosts(np->nat_cnum, etu);
- /* Maintain and build ships */
+ /* Maintain ships */
sea_money[player->cnum] = 0;
*ships = prod_ship(etu, player->cnum, bp, 0);
*smaint = sea_money[player->cnum];
+
+ /* Maintain planes */
+ air_money[player->cnum] = 0;
+ *planes = prod_plane(etu, player->cnum, bp, 0);
+ *pmaint = air_money[player->cnum];
+
+ /* Maintain land units */
+ lnd_money[player->cnum] = 0;
+ *units = prod_land(etu, player->cnum, bp, 0);
+ *lmaint = lnd_money[player->cnum];
+
+ /* Produce */
+ produce_sect(player->cnum, etu, bp, p_sect);
+
+ /* Build ships */
sea_money[player->cnum] = 0;
*nsbuild = prod_ship(etu, player->cnum, bp, 1);
*sbuild = sea_money[player->cnum];
sea_money[player->cnum] = 0;
- /* Maintain and build planes */
- air_money[player->cnum] = 0;
- *planes = prod_plane(etu, player->cnum, bp, 0);
- *pmaint = air_money[player->cnum];
+ /* Build planes */
air_money[player->cnum] = 0;
*npbuild = prod_plane(etu, player->cnum, bp, 1);
*pbuild = air_money[player->cnum];
air_money[player->cnum] = 0;
- /* Maintain and build land units */
- lnd_money[player->cnum] = 0;
- *units = prod_land(etu, player->cnum, bp, 0);
- *lmaint = lnd_money[player->cnum];
+ /* Build land units */
lnd_money[player->cnum] = 0;
*nlbuild = prod_land(etu, player->cnum, bp, 1);
*lbuild = lnd_money[player->cnum];
lnd_money[player->cnum] = 0;
- /* Produce */
- produce_sect(player->cnum, etu, bp, p_sect);
-
free(bp);
}
projects / empserver / blobdiff