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 038ec71783eea385c495591e9c4dfa2249a601ca..91fcb89f5d1d52191063ce5a707e782d3fdb1595 100644 (file)
--- a/src/lib/common/res_pop.c
+++ b/src/lib/common/res_pop.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-2016, 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,7 +25,7 @@
  *  ---
  *
  *  res_pop.c: Get maximum pop of a sector
- * 
+ *
  *  Known contributors to this file:
  *     Ken Stevens, 1995
  *     Steve McClure, 1998
@@ -34,23 +33,24 @@
 
 #include <config.h>
 
+#include "item.h"
 #include "misc.h"
+#include "optlist.h"
+#include "prototypes.h"
 #include "sect.h"
-#include "nat.h"
-#include "item.h"
 #include "xy.h"
-#include "optlist.h"
-#include "common.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 */