diff --git a/src/lib/commands/new.c b/src/lib/commands/new.c index d33a4a36..76014fbb 100644 --- a/src/lib/commands/new.c +++ b/src/lib/commands/new.c @@ -34,13 +34,14 @@ #include #include -#if !defined(_WIN32) +#ifndef _WIN32 #include #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.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.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(§); }