From: Markus Armbruster <armbru@pond.sub.org>
Date: Thu, 13 Jul 2006 18:42:34 +0000 (+0000)
Subject: (init_sanct): Spread food evenly among sanctuaries, for simplicity.
X-Git-Tag: v4.3.7~10
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=a3eb9c0d301e8e2fe508d9c810e1cf7a34c9fb56

(init_sanct): Spread food evenly among sanctuaries, for simplicity.
Give max_pop() civilians (changes civs from 999 to 1000).
---

diff --git a/src/lib/commands/new.c b/src/lib/commands/new.c
index d33a4a36a..76014fbb3 100644
--- a/src/lib/commands/new.c
+++ b/src/lib/commands/new.c
@@ -34,13 +34,14 @@
 #include <config.h>
 
 #include <fcntl.h>
-#if !defined(_WIN32)
+#ifndef _WIN32
 #include <unistd.h>
 #endif
 #include "commands.h"
 #include "land.h"
 #include "optlist.h"
 #include "path.h"
+#include "prototypes.h"
 #include "tel.h"
 
 static int isok(int x, int y);
@@ -159,7 +160,6 @@ static void
 init_sanct(struct natstr *natp, coord x, coord y)
 {
     struct sctstr sect;
-    int is_cap = natp->nat_xcap == x && natp->nat_ycap == y;
 
     getsect(x, y, &sect);
     sect.sct_own = natp->nat_cnum;
@@ -179,9 +179,9 @@ init_sanct(struct natstr *natp, coord x, coord y)
 	sect.sct_min = 100;
 	sect.sct_gmin = 100;
     }
-    sect.sct_item[I_CIVIL] = opt_RES_POP ? 550 : 999;
+    sect.sct_item[I_CIVIL] = max_pop(start_research, &sect);
     sect.sct_item[I_MILIT] = 55;
-    sect.sct_item[I_FOOD] = is_cap ? 1000 : 100;
+    sect.sct_item[I_FOOD] = opt_NOFOOD ? 0 : 550;
     sect.sct_item[I_UW] = 75;
     putsect(&sect);
 }