Update copyright notice

[empserver] / src / lib / update / main.c

diff --git a/src/lib/update/main.c b/src/lib/update/main.c
index 790e59e733f5af8baabbe1b1f194df409a51e9e8..3987b7696ed6e68decf501096e5fe849d80ab4f1 100644 (file)
--- a/src/lib/update/main.c
+++ b/src/lib/update/main.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,20 +26,23 @@
  *  ---
  *
  *  main.c: World update main function
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1994
  *     Steve McClure, 1996
  *     Doug Hay, 1998
+ *     Markus Armbruster, 2006-2009
  */
 
 #include <config.h>
 
 #include "budg.h"
 #include "empthread.h"
+#include "game.h"
 #include "journal.h"
 #include "player.h"
 #include "server.h"
+#include "unit.h"
 #include "update.h"
 
 long money[MAXNOC];
@@ -54,21 +57,22 @@ update_main(void)
 {
     int etu = etu_per_update;
     int n;
-    int x;
+    int i;
     struct bp *bp;
     int cn, cn2, rel;
     struct natstr *cnp;
     struct natstr *np;
 
     logerror("production update (%d etus)", etu);
+    game_record_update(time(NULL));
     journal_update(etu);
 
     /* First, make sure all mobility is updated correctly. */
     if (opt_MOB_ACCESS) {
-       mob_ship(etu);
-       mob_sect(etu);
-       mob_plane(etu);
-       mob_land(etu);
+       mob_ship();
+       mob_sect();
+       mob_plane();
+       mob_land();
     }
 
     if (opt_AUTO_POWER)
@@ -96,32 +100,32 @@ update_main(void)
     prepare_sects(etu, bp);
     logerror("done preparing sectors.");
     logerror("producing for countries...");
-    for (x = 0; x < MAXNOC; x++) {
-       long p_sect[SCT_TYPE_MAX+2][2];
+    for (i = 0; i < MAXNOC; i++) {
+       long p_sect[SCT_BUDG_MAX+1][2];
 
        memset(p_sect, 0, sizeof(p_sect));
-       if (!(np = getnatp(x)))
+       if (!(np = getnatp(i)))
            continue;
        if (np->nat_stat == STAT_SANCT) {
 #ifdef DEBUG
-           logerror("Country %i is in sanctuary and did not update", x);
+           logerror("Country %i is in sanctuary and did not update", i);
 #endif
            continue;
        }
        np->nat_money += (int)(np->nat_reserve * money_res * etu);
 
        /* maintain units */
-       prod_ship(etu, x, bp, 0);
-       prod_plane(etu, x, bp, 0);
-       prod_land(etu, x, bp, 0);
+       prod_ship(etu, i, bp, 0);
+       prod_plane(etu, i, bp, 0);
+       prod_land(etu, i, bp, 0);
 
        /* produce all sects */
-       produce_sect(x, etu, bp, p_sect);
+       produce_sect(i, etu, bp, p_sect);
 
        /* build units */
-       prod_ship(etu, x, bp, 1);
-       prod_plane(etu, x, bp, 1);
-       prod_land(etu, x, bp, 1);
+       prod_ship(etu, i, bp, 1);
+       prod_plane(etu, i, bp, 1);
+       prod_land(etu, i, bp, 1);
     }
     logerror("done producing for countries.");
 
@@ -129,12 +133,11 @@ update_main(void)
     prod_nat(etu);
     age_levels(etu);
     free(bp);
-    /*flushwu(); */
     if (opt_SLOW_WAR) {
        /* Update war declarations */
        /* MOBILIZATION->SITZKRIEG->AT_WAR */
        for (cn = 1; cn < MAXNOC; cn++) {
-           if ((cnp = getnatp(cn)) == 0)
+           if (!(cnp = getnatp(cn)))
                break;
            for (cn2 = 1; cn2 < MAXNOC; cn2++) {
                if (cn2 == cn)
@@ -153,10 +156,10 @@ update_main(void)
     /* 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) {
-       mob_ship(etu);
-       mob_sect(etu);
-       mob_plane(etu);
-       mob_land(etu);
+       mob_ship();
+       mob_sect();
+       mob_plane();
+       mob_land();
     }
     if (update_demand == UPD_DEMAND_SCHED
        || update_demand == UPD_DEMAND_ASYNC)
@@ -167,8 +170,10 @@ update_main(void)
     ef_flush(EF_SHIP);
     ef_flush(EF_PLANE);
     ef_flush(EF_LAND);
+    unit_cargo_init();
     delete_old_announcements();
     delete_old_news();
+    delete_old_lostitems();
     /* Clear all the telegram flags */
     for (cn = 0; cn < MAXNOC; cn++)
        clear_telegram_is_new(cn);