(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 d33a4a36a4f2961a15e4cad7e070db652b980687..76014fbb36913b568c9b9fd43264e871ffc23e5c 100644 (file)
--- a/src/lib/commands/new.c
+++ b/src/lib/commands/new.c
@@ -34,13 +34,14 @@
 #include <config.h>
 
 #include <fcntl.h>
 #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 <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);
 #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;
 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;
 
     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_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_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);
 }
     sect.sct_item[I_UW] = 75;
     putsect(&sect);
 }