diff --git a/src/lib/commands/upda.c b/src/lib/commands/upda.c index 81e4c12b..da9355a6 100644 --- a/src/lib/commands/upda.c +++ b/src/lib/commands/upda.c @@ -135,11 +135,7 @@ upda(void) if (*update_demandtimes != 0) pr("Demand updates are allowed during: %s\n", update_demandtimes); - if (update_wantmin == 0) { - pr("Demand updates are disabled by a mininum of 0\n"); - } else { - pr("Demand updates require %d country(s) to want one.\n", update_wantmin); - } + pr("Demand updates require %d country(s) to want one.\n", update_wantmin); } } if (*game_days != 0) diff --git a/src/lib/common/wantupd.c b/src/lib/common/wantupd.c index 2557c643..1e71bf6b 100644 --- a/src/lib/common/wantupd.c +++ b/src/lib/common/wantupd.c @@ -59,12 +59,12 @@ update_policy_check(void) update_demandpolicy = UDDEM_DEFAULT; if (update_demandpolicy > UDDEM_MAX) update_demandpolicy = UDDEM_DEFAULT; - if (update_wantmin < 0) - update_wantmin = 0; + if (update_wantmin < 1) + update_wantmin = 1; if (update_wantmin > MAXNOC) update_wantmin = MAXNOC; - if (blitz_time < 0) - blitz_time = 0; + if (blitz_time < 1) + blitz_time = 1; } static int @@ -153,11 +153,6 @@ demand_check(void) time(&cur); - if (0 == update_wantmin) { - logerror("no demand update allowed, wantmin = 0"); - return 0; - } - demand_update_want(&want, &pop, 0); if (want < update_wantmin) { logerror("no demand update, want = %d, min = %d", diff --git a/src/lib/global/constants.c b/src/lib/global/constants.c index c66ca23d..8f37df36 100644 --- a/src/lib/global/constants.c +++ b/src/lib/global/constants.c @@ -30,7 +30,6 @@ * Known contributors to this file: * Ken Stevens, 1995 * Steve McClure, 1996 - * */ #include @@ -57,7 +56,7 @@ char *update_times = ""; /* update times for policy UDP_TIMES */ int update_policy = UDP_DEFAULT; /* update policy for regular updates */ int update_demandpolicy = UDDEM_DEFAULT; /* update policy for demand updates */ int update_missed = 999; /* demand updates missed before veto */ -int update_wantmin = 0; /* votes required for demand update */ +int update_wantmin = 1; /* votes required for demand update */ int blitz_time = 10; /* number of minutes between blitz updates */ char *update_demandtimes = ""; /* demand update time ranges */ char *game_days = ""; /* days game is running */