/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2007, 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.
*
* ---
*
* Doug Hay, 1998
*/
-#include "misc.h"
-#include "nat.h"
-#include "file.h"
-#include "sect.h"
-#include "player.h"
-#include "empthread.h"
-#include "var.h"
+#include <config.h>
+
#include "budg.h"
-#include "product.h"
+#include "empthread.h"
+#include "journal.h"
#include "player.h"
-#include "update.h"
-#include "common.h"
-#include "optlist.h"
#include "server.h"
-#include <stdlib.h>
-#if !defined(_WIN32)
-#include <sys/time.h>
-#endif
+#include "update.h"
long money[MAXNOC];
long pops[MAXNOC];
int update_pending = 0;
-static void do_prod(int, int, int, int *, long int (*)[2], int *, int *,
- int *, int *, int *, int *);
-
/*ARGSUSED*/
void
update_main(void *unused)
struct natstr *cnp;
struct natstr *np;
+ if (CANT_HAPPEN(!update_pending))
+ update_pending = 1;
+
+ logerror("production update (%d etus)", etu);
+ journal_update(etu);
+
/* First, make sure all mobility is updated correctly. */
if (opt_MOB_ACCESS) {
mob_ship(etu);
mob_plane(etu);
mob_land(etu);
}
- update_pending = 1;
player->proc = empth_self();
player->cnum = 0;
player->god = 1;
+
+ if (opt_AUTO_POWER)
+ update_power();
+
/*
* set up all the variables which get used in the
* sector production routine (for producing education,
* happiness, and printing out the state of the nation)
*/
- logerror("production update (%d etus)", etu);
memset(pops, 0, sizeof(pops));
memset(air_money, 0, sizeof(air_money));
memset(sea_money, 0, sizeof(sea_money));
memset(lnd_money, 0, sizeof(lnd_money));
- bp = (int *)calloc(WORLD_X * WORLD_Y * 7, sizeof(int));
+ bp = calloc(WORLD_X * WORLD_Y * 7, sizeof(int));
for (n = 0; n < MAXNOC; n++) {
money[n] = 0;
- if ((np = getnatp(n)) == (struct natstr *)0)
+ if (!(np = getnatp(n)))
continue;
money[n] = np->nat_money;
tpops[n] = count_pop(n);
logerror("done preparing sectors.");
logerror("producing for countries...");
for (x = 0; x < MAXNOC; x++) {
- int y, z, sb = 0, sm = 0, pb = 0, pm = 0, lm = 0, lb = 0;
- long p_sect[SCT_MAXDEF+1][2];
+ long p_sect[SCT_TYPE_MAX+2][2];
memset(p_sect, 0, sizeof(p_sect));
- mil_dbl_pay = 0;
- if ((np = getnatp(x)) == (struct natstr *)0)
+ if (!(np = getnatp(x)))
continue;
- if (np->nat_stat & STAT_SANCT) {
+ if (np->nat_stat == STAT_SANCT) {
#ifdef DEBUG
logerror("Country %i is in sanctuary and did not update", x);
#endif
}
np->nat_money += (int)(np->nat_reserve * money_res * etu);
- for (y = 1; y <= PRI_MAX; y++) {
- for (z = 0; z <= PRI_MAX; z++) {
- if (np->nat_priorities[z] == y) {
- do_prod(z, etu, x, bp, p_sect,
- &sb, &sm, &pb, &pm, &lb, &lm);
- }
- }
- }
- /* 0 is maintain, 1 is build */
- if (!sm)
- prod_ship(etu, x, bp, 0);
- if (!sb)
- prod_ship(etu, x, bp, 1);
- if (!pm)
- prod_plane(etu, x, bp, 0);
- if (!pb)
- prod_plane(etu, x, bp, 1);
- if (!lm)
- prod_land(etu, x, bp, 0);
- if (!lb)
- prod_land(etu, x, bp, 1);
-
- /* produce all sects that haven't produced yet */
- produce_sect(x, etu, bp, p_sect, -1);
- np->nat_money -= p_sect[SCT_CAPIT][1];
+ /* maintain units */
+ prod_ship(etu, x, bp, 0);
+ prod_plane(etu, x, bp, 0);
+ prod_land(etu, x, bp, 0);
+
+ /* produce all sects */
+ produce_sect(x, etu, bp, p_sect);
+
+ /* build units */
+ prod_ship(etu, x, bp, 1);
+ prod_plane(etu, x, bp, 1);
+ prod_land(etu, x, bp, 1);
}
logerror("done producing for countries.");
}
}
}
- /* Age contact */
- if (opt_LOSE_CONTACT) {
- for (cn = 1; cn < MAXNOC; cn++) {
- if ((cnp = getnatp(cn)) != NULL)
- agecontact(cnp);
- }
- }
/* Only update mobility for non-MOB_ACCESS here, since it doesn't
get done for MOB_ACCESS anyway during the update */
if (!opt_MOB_ACCESS) {
ef_flush(EF_PLANE);
ef_flush(EF_LAND);
delete_old_announcements();
+ delete_old_news();
/* Clear all the telegram flags */
for (cn = 0; cn < MAXNOC; cn++)
clear_telegram_is_new(cn);
empth_exit();
/*NOTREACHED*/
}
-
-static void
-do_prod(int sector_type, int etu, int n, int *bp, long int (*p_sect)[2],
- int *ship_build, int *ship_maint, int *plane_build,
- int *plane_maint, int *land_build, int *land_maint)
-{
- struct natstr *np;
-
- np = getnatp(n);
-
- if (sector_type == PRI_SMAINT) {
- prod_ship(etu, n, bp, 0);
- *ship_maint = 1;
- } else if (sector_type == PRI_SBUILD) {
- prod_ship(etu, n, bp, 1);
- *ship_build = 1;
- } else if (sector_type == PRI_PMAINT) {
- prod_plane(etu, n, bp, 0);
- *plane_maint = 1;
- } else if (sector_type == PRI_PBUILD) {
- prod_plane(etu, n, bp, 1);
- *plane_build = 1;
- } else if (sector_type == PRI_LMAINT) {
- if (*land_build)
- np->nat_money -= (int)(money_mil * etu * mil_dbl_pay);
- prod_land(etu, n, bp, 0);
- *land_maint = 1;
- } else if (sector_type == PRI_LBUILD) {
- prod_land(etu, n, bp, 1);
- *land_build = 1;
- } else {
- produce_sect(n, etu, bp, p_sect, sector_type);
- }
-}
projects / empserver / blobdiff