License upgrade to GPL version 3 or later

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

diff --git a/src/lib/update/plague.c b/src/lib/update/plague.c
index 461920b19f7448e78ab7b823ec4830b9fc5d7622..cdafc032c88bc24571f657c31f59c0c2fecb23b9 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-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, 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,37 +14,29 @@
  *  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/>.
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
  *  plague.c: Plague related functions
- * 
+ *
  *  Known contributors to this file:
  *     Steve McClure, 1998-2000
  */
 
-#include "misc.h"
-#include "plague.h"
-#include "sect.h"
-#include "nat.h"
+#include <config.h>
+
 #include "item.h"
+#include "lost.h"
 #include "news.h"
-#include "file.h"
-#include "xy.h"
-#include "optlist.h"
+#include "plague.h"
 #include "update.h"
-#include "common.h"
-#include "subs.h"
-#include "lost.h"
-#include "gen.h"
 
 static int infect_people(struct natstr *, struct sctstr *);
 
@@ -106,7 +98,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;
@@ -151,8 +143,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;
@@ -168,7 +159,7 @@ plague_people(struct natstr *np, short *vec,
        plg_num = 100.0 * etus;
        plg_denom = (np->nat_level[NAT_RLEV] + 100.0) *
            (*ptime + etus + 1.0);
-       pct_left = 1.0 - (double)(plg_num / plg_denom);
+       pct_left = 1.0 - plg_num / plg_denom;
        if (pct_left < 0.2)
            pct_left = 0.2;
        vec[I_CIVIL] = vec[I_CIVIL] * pct_left;
@@ -190,7 +181,7 @@ plague_people(struct natstr *np, short *vec,
     }
     if (*ptime <= 0) {
        *pstage -= 1;
-       *ptime = (etus / 2) + (random() % etus);
+       *ptime = etus / 2 + random() % etus;
     }
     return stage;
 }