Update copyright notice

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

diff --git a/src/lib/update/populace.c b/src/lib/update/populace.c
index f5bcfeaf1385bc56f192fb4b45177374b4b6130a..899a14aa9daac0ffc2f45ec963a004bd4e7abbb2 100644 (file)
--- a/src/lib/update/populace.c
+++ b/src/lib/update/populace.c
@@ -1,11 +1,11 @@
 /*
  *  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-2018, 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,
@@ -14,8 +14,7 @@
  *  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/>.
  *
  *  ---
  *
@@ -26,38 +25,54 @@
  *  ---
  *
  *  populace.c: Return workforce available
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
+ *     Markus Armbruster, 2004-2016
  */
 
 #include <config.h>
 
-#include "land.h"
+#include "chance.h"
 #include "lost.h"
-#include "path.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]
-       && !has_units(sp->sct_x, sp->sct_y, sp->sct_own, 0)) {
+    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;
     }
@@ -74,7 +89,7 @@ populace(struct natstr *np, struct sctstr *sp, int etu)
        n = roundavg(etu * 0.125);
        if (n == 0)
            n = 1;
-       n = sp->sct_loyal + (random() % n) + 1;
+       n = sp->sct_loyal + roll(n);
        if (n > 127)
            n = 127;
        sp->sct_loyal = n;
@@ -82,7 +97,7 @@ populace(struct natstr *np, struct sctstr *sp, int etu)
     if (sp->sct_loyal > 65 && mil < civ / 20) {
        int work_red;
 
-       work_red = sp->sct_loyal - (50 + (random() % 15));
+       work_red = sp->sct_loyal - (49 + roll(15));
        n = sp->sct_work - work_red;
        if (n < 0)
            n = 0;
@@ -103,11 +118,7 @@ populace(struct natstr *np, struct sctstr *sp, int etu)
            n -= roundavg(etu * 0.25);
        else
            n += roundavg(etu * 0.125);
-       if (n < 0)
-           n = 0;
-       else if (n > 127)
-           n = 127;
-       sp->sct_loyal = n;
+       sp->sct_loyal = LIMIT_TO(n, 0, 127);
        if (sp->sct_loyal == 0) {
            if (sp->sct_oldown != sp->sct_own) {
                wu(0, sp->sct_own,
@@ -120,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);
 }