/*
* 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,
* 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.
*
* ---
*
* res_pop.c: Get maximum pop of a sector
- *
+ *
* Known contributors to this file:
* Ken Stevens, 1995
* Steve McClure, 1998
*/
+#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;
- if (opt_BIG_CITY) {
- /* city efficiency limits maximum population */
- if (dchr[desig].d_pkg == UPKG)
- maxpop *= 1 + 9.0 * eff / 100;
+ /* city efficiency limits maximum population */
+ if (IS_BIG_CITY(desig)) {
+ mp100 = MIN(ITEM_MAX, 10 * maxpop);
+ maxpop += (mp100 - maxpop) * eff / 100.0;
}
if (opt_RES_POP) {