Encapsulate direct use of random(), srandom() in chance.c

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

diff --git a/src/lib/update/populace.c b/src/lib/update/populace.c
index d4944d05a67380e7925e9e00b326ff650fae0f77..4347a448d67dfb3a24813acc6fe841223cd6518b 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-2013, 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,33 +25,22 @@
  *  ---
  *
  *  populace.c: Return workforce available
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
+ *     Markus Armbruster, 2004-2012
  */
 
 #include <config.h>
 
-#include "misc.h"
-#include "sect.h"
-#include "nat.h"
-#include "file.h"
-#include "path.h"
-#include "xy.h"
-#include "land.h"
-#include "update.h"
-#include "subs.h"
-#include "gen.h"
-#include "common.h"
+#include "chance.h"
 #include "lost.h"
+#include "update.h"
 
 void
 populace(struct natstr *np, struct sctstr *sp, int etu)
 {
-    float hap;
-    float tech;
-    float edu;
-    float pct;
+    double hap, pct;
     int n;
     int civ = sp->sct_item[I_CIVIL];
     int mil = sp->sct_item[I_MILIT];
@@ -63,7 +51,7 @@ populace(struct natstr *np, struct sctstr *sp, int etu)
        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)) {
+       && !has_units(sp->sct_x, sp->sct_y, sp->sct_own, NULL)) {
        makelost(EF_SECTOR, sp->sct_own, 0, sp->sct_x, sp->sct_y);
        sp->sct_own = 0;
        sp->sct_oldown = 0;
@@ -74,11 +62,9 @@ populace(struct natstr *np, struct sctstr *sp, int etu)
     }
 
     hap = np->nat_level[NAT_HLEV];
-    edu = np->nat_level[NAT_ELEV];
-    tech = np->nat_level[NAT_TLEV];
-    pct = (double)((tech - 40) / 40.0 + edu / 3.0);
+    pct = hap_req(np);
     if (sp->sct_own == sp->sct_oldown && hap < pct &&
-       chance((double)(((double)pct - (double)hap) / (double)5.0))) {
+       chance((pct - hap) / 5.0)) {
        /*
         * zap the loyalty of unhappy civilians.
         * there is a 20% chance per hap point below the
@@ -87,7 +73,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 + roll0(n) + 1;
        if (n > 127)
            n = 127;
        sp->sct_loyal = n;
@@ -95,12 +81,12 @@ 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 - (50 + roll0(15));
        n = sp->sct_work - work_red;
        if (n < 0)
            n = 0;
        sp->sct_work = n;
-       if (chance((double)work_red / 1000.0)) {
+       if (chance(work_red / 1000.0)) {
            /*
             * small chance of rebellion...
             * if work_red is (max) 67,