Update copyright notice.

[empserver] / src / lib / common / res_pop.c

diff --git a/src/lib/common/res_pop.c b/src/lib/common/res_pop.c
index eba5b8b004b0c552a946e27397e50d254340edca..5a57b6f7aa39c90b747c16cb39f907aaa3628e30 100644 (file)
--- a/src/lib/common/res_pop.c
+++ b/src/lib/common/res_pop.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-2007, 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,23 +32,27 @@
  *     Steve McClure, 1998
  */
 
+#include <config.h>
+
+#include "item.h"
 #include "misc.h"
-#include "sect.h"
 #include "nat.h"
-#include "item.h"
-#include "xy.h"
 #include "optlist.h"
-#include "common.h"
+#include "prototypes.h"
+#include "sect.h"
+#include "xy.h"
 
 int
 max_population(float research, int desig, int eff)
 {
     int maxpop = dchr[desig].d_maxpop;
-    int rmax;
+    int mp100, rmax;
 
     /* city efficiency limits maximum population */
-    if (IS_BIG_CITY(desig))
-       maxpop *= 1 + 9.0 * eff / 100;
+    if (IS_BIG_CITY(desig)) {
+       mp100 = MIN(ITEM_MAX, 10 * maxpop);
+       maxpop += (mp100 - maxpop) * eff / 100.0;
+    }
 
     if (opt_RES_POP) {
        /* research limits maximum population */