Update copyright notice

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

diff --git a/src/lib/update/populace.c b/src/lib/update/populace.c
index 03414d44e058a7615f788fe24d729d38763d04df..899a14aa9daac0ffc2f45ec963a004bd4e7abbb2 100644 (file)
--- a/src/lib/update/populace.c
+++ b/src/lib/update/populace.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2015, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2018, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -28,35 +28,51 @@
  *
  *  Known contributors to this file:
  *     Dave Pare, 1986
- *     Markus Armbruster, 2004-2014
+ *     Markus Armbruster, 2004-2016
  */
 
 #include <config.h>
 
 #include "chance.h"
 #include "lost.h"
+#include "optlist.h"
+#include "prototypes.h"
+#include "nat.h"
+#include "sect.h"
 #include "update.h"
 
 void
-populace(struct natstr *np, struct sctstr *sp, int etu)
+check_pop_loss(struct sctstr *sp)
 {
-    double hap, pct;
-    int n;
     int civ = sp->sct_item[I_CIVIL];
     int mil = sp->sct_item[I_MILIT];
 
-    if (civ == 0 && mil > 0) {
+    if (!civ) {
        sp->sct_work = 100;
        sp->sct_loyal = 0;
        sp->sct_oldown = sp->sct_own;
     }
-    if (!civ && !mil && !sp->sct_item[I_UW]
+    if (sp->sct_own && !civ && !mil
        && !has_units(sp->sct_x, sp->sct_y, sp->sct_own)) {
        makelost(EF_SECTOR, sp->sct_own, 0, sp->sct_x, sp->sct_y);
        sp->sct_own = 0;
        sp->sct_oldown = 0;
-       return;
+       sp->sct_mobil = 0;
     }
+}
+
+void
+populace(struct sctstr *sp, int etu)
+{
+    struct natstr *np = getnatp(sp->sct_own);
+    double hap, pct;
+    int n;
+    int civ = sp->sct_item[I_CIVIL];
+    int mil = sp->sct_item[I_MILIT];
+
+    if (!civ && !mil && !sp->sct_item[I_UW])
+       return;
+
     if (sp->sct_own != sp->sct_oldown && sp->sct_loyal == 0) {
        sp->sct_oldown = sp->sct_own;
     }
@@ -115,14 +131,16 @@ populace(struct natstr *np, struct sctstr *sp, int etu)
 }
 
 int
-total_work(int sctwork, int etu, int civil, int milit, int uw, int maxpop)
+total_work(int sctwork, int etu, int civil, int milit, int uw,
+          int maxworkers)
 {
-    if (civil > maxpop)
-       civil = maxpop;
-    if (milit > maxpop)
-       milit = maxpop;
-    if (uw > maxpop)
-       uw = maxpop;
+    if (civil > maxworkers)
+       civil = maxworkers;
+    if (milit > maxworkers)
+       milit = maxworkers;
+    if (uw > maxworkers)
+       uw = maxworkers;
 
-    return (civil * sctwork / 100.0 + milit * 0.4 + uw) * etu / 100.0;
+    return roundavg((civil * sctwork / 100.0 + milit / 2.5 + uw)
+                   * etu / 100.0);
 }