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

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

diff --git a/src/lib/update/plague.c b/src/lib/update/plague.c
index 4429d06d2a51658a0d4538332e7e181cf082d51b..df179e0b9d149e8f873567022bf56c6cb48f0d43 100644 (file)
--- a/src/lib/update/plague.c
+++ b/src/lib/update/plague.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,13 +25,15 @@
  *  ---
  *
  *  plague.c: Plague related functions
- * 
+ *
  *  Known contributors to this file:
  *     Steve McClure, 1998-2000
+ *     Markus Armbruster, 2004-2012
  */
 
 #include <config.h>
 
+#include "chance.h"
 #include "item.h"
 #include "lost.h"
 #include "news.h"
@@ -99,7 +100,7 @@ do_plague(struct sctstr *sp, struct natstr *np, int etu)
        }
     }
     if (sp->sct_item[I_CIVIL] == 0 && sp->sct_item[I_MILIT] == 0
-       && !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;
@@ -144,8 +145,7 @@ infect_people(struct natstr *np, struct sctstr *sp)
  */
 int
 plague_people(struct natstr *np, short *vec,
-             int *pstage, int *ptime,
-             int etus)
+             int *pstage, int *ptime, int etus)
 {
     int stage;
     double plg_num;
@@ -183,7 +183,7 @@ plague_people(struct natstr *np, short *vec,
     }
     if (*ptime <= 0) {
        *pstage -= 1;
-       *ptime = (etus / 2) + (random() % etus);
+       *ptime = etus / 2 + roll0(etus);
     }
     return stage;
 }