COPYING duplicates information from README. Remove. Move GPL from

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

diff --git a/src/lib/update/human.c b/src/lib/update/human.c
index 075a18ec7b704ddf5efbc9ac40a5e5d9084b2c78..bdf7041453918df58bc9ff951cbe630640c2b850 100644 (file)
--- a/src/lib/update/human.c
+++ b/src/lib/update/human.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
@@ -32,6 +32,8 @@
  *     Steve McClure, 1996
  */
 
+#include <config.h>
+
 #include "misc.h"
 #include "sect.h"
 #include "nat.h"
@@ -144,7 +146,7 @@ int
 new_work(struct sctstr *sp, int delta)
 {
     if (sp->sct_type == sp->sct_newtype)
-       return min(rollover_avail_max, sp->sct_avail) + delta;
+       return MIN(rollover_avail_max, sp->sct_avail) + delta;
 
     return delta;
 }
@@ -159,7 +161,7 @@ growfood(struct sctstr *sp, short *vec, int work, int etu)
 
     food_workers = work * fcrate;
     food_fertil = etu * sp->sct_fertil * fgrate;
-    food = min(food_workers, food_fertil);
+    food = MIN(food_workers, food_fertil);
     if (food > ITEM_MAX - vec[I_FOOD])
        food = ITEM_MAX - vec[I_FOOD];
     /*
@@ -284,6 +286,9 @@ babies(int adults, int etu, double brate, int food, int maxpop)
 {
     int new_birth, new_food, new;
 
+    if (adults >= maxpop)
+       return 0;
+
     new_birth = roundavg(brate * etu * adults);
     if (opt_NOFOOD)
        new_food = new_birth;