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 6b27f5e708d1f68ee3061b54cc293bd88ef8d0a3..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-2004, 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,40 +32,44 @@
  *     Steve McClure, 1998
  */
 
-#include <math.h>
+#include <config.h>
+
+#include "item.h"
 #include "misc.h"
-#include "sect.h"
 #include "nat.h"
-#include "item.h"
-#include "news.h"
-#include "file.h"
-#include "xy.h"
 #include "optlist.h"
-#include "common.h"
+#include "prototypes.h"
+#include "sect.h"
+#include "xy.h"
 
 int
-max_pop(float research, struct sctstr *sp)
+max_population(float research, int desig, int eff)
 {
-    int maxpop = 999;
+    int maxpop = dchr[desig].d_maxpop;
+    int mp100, rmax;
 
-    if (opt_RES_POP) {
-       maxpop = 400 + 600 * ((50.0 + 4.0 * research)
-                             / (200.0 + 3.0 * research));
-       if (maxpop > 999)
-           maxpop = 999;
+    /* city efficiency limits maximum population */
+    if (IS_BIG_CITY(desig)) {
+       mp100 = MIN(ITEM_MAX, 10 * maxpop);
+       maxpop += (mp100 - maxpop) * eff / 100.0;
     }
 
-    if (opt_BIG_CITY) {
-       if (sp && dchr[sp->sct_type].d_pkg == UPKG)
-           maxpop = (int)(maxpop * ((9.0 * sp->sct_effic) / 100 + 1));
+    if (opt_RES_POP) {
+       /* research limits maximum population */
+       rmax = maxpop * 0.4
+           + maxpop * 0.6 * (50.0 + 4.0*research) / (200.0 + 3.0*research);
+       if (maxpop > rmax)
+           maxpop = rmax;
     }
 
-    if (sp) {
-       if (sp->sct_type == SCT_MOUNT)
-           maxpop /= 10;
-       else if (sp->sct_type == SCT_PLAINS)
-           maxpop /= 20;
-    }
+    if (CANT_HAPPEN(maxpop > ITEM_MAX))
+       maxpop = ITEM_MAX;
 
     return maxpop;
 }
+
+int
+max_pop(float research, struct sctstr *sp)
+{
+    return max_population(research, sp->sct_type, sp->sct_effic);
+}