Update copyright notice.

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

diff --git a/src/lib/update/plague.c b/src/lib/update/plague.c
index 94ba2702f1ff0c39465e04d5d293984e85f93148..20d09ff6c437b8c3f9241eab8f60d1c39bfe9111 100644 (file)
--- a/src/lib/update/plague.c
+++ b/src/lib/update/plague.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -52,7 +52,6 @@ static int infect_people(struct natstr *, struct sctstr *);
 void
 do_plague(struct sctstr *sp, struct natstr *np, int etu)
 {
-    int vec[I_MAX + 1];
     u_short pstage, ptime;
     int n;
 
@@ -66,8 +65,7 @@ do_plague(struct sctstr *sp, struct natstr *np, int etu)
        pstage = infect_people(np, sp);
        ptime = 0;
     } else {
-       getvec(VT_ITEM, vec, (s_char *)sp, EF_SECTOR);
-       n = plague_people(np, vec, &pstage, &ptime, etu);
+       n = plague_people(np, sp->sct_item, &pstage, &ptime, etu);
        switch (n) {
        case PLG_DYING:
            wu(0, sp->sct_own, "PLAGUE deaths reported in %s.\n",
@@ -107,7 +105,6 @@ do_plague(struct sctstr *sp, struct natstr *np, int etu)
        default:
            break;
        }
-       putvec(VT_ITEM, vec, (s_char *)sp, EF_SECTOR);
     }
     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)) {
@@ -136,7 +133,7 @@ infect_people(struct natstr *np, struct sctstr *sp)
      * make plague where there was none before...
      */
     pop = sp->sct_item[I_CIVIL] + sp->sct_item[I_MILIT] + sp->sct_item[I_UW];
-    pop_space = opt_BIG_CITY && (sp->sct_type == SCT_CAPIT) ? 9999.0 : 999.0;
+    pop_space = max_pop(np->nat_level[NAT_RLEV], sp);
     bad_stuff
        = sp->sct_item[I_IRON] + sp->sct_item[I_OIL] + sp->sct_item[I_RAD] * 2;
     pollution = bad_stuff / 10.0 + np->nat_level[NAT_TLEV] + 100.0;
@@ -154,7 +151,7 @@ infect_people(struct natstr *np, struct sctstr *sp)
  * stage.  No reports generated here anymore.
  */
 int
-plague_people(struct natstr *np, register int *vec,
+plague_people(struct natstr *np, short *vec,
              u_short *pstage, u_short *ptime,
              int etus)
 {