empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(opt_DEMANDUPDATE): Remove. Deities can use update_demandpolicy to

Browse source 
control demand updates.
This commit is contained in:
Markus Armbruster 2007-07-08 15:26:23 +00:00
parent d0e2834ca9
commit 6ca5e47f69
6 changed files with 30 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/lib/commands/upda.c
View file

@ -102,38 +102,38 @@ upda(void)
next += update_window;
pr("The next update window stops at %19.19s.\n", ctime(&next));
}
if (opt_DEMANDUPDATE) {
if (update_demandpolicy != UDDEM_DISABLE) {
switch (update_demandpolicy) {
case UDDEM_TMCHECK:
next_update_check_time(&now, &next, &delta);
pr("Demand updates occur at update CHECK times.\n");
pr("The next update check is at %19.19s.\n",
ctime(&next));
break;
case UDDEM_COMSET:
pr("Demand updates occur right after the demand is set.\n");
break;
default:
pr("Update demand policy is inconsistent.\n");
}
}
switch (update_demandpolicy) {
case UDDEM_TMCHECK:
next_update_check_time(&now, &next, &delta);
pr("Demand updates occur at update CHECK times.\n");
pr("The next update check is at %19.19s.\n",
ctime(&next));
break;
case UDDEM_COMSET:
pr("Demand updates occur right after the demand is set.\n");
break;
case UDDEM_DISABLE:
break;
default:
CANT_REACH();
pr("Update demand policy is inconsistent.\n");
}
if ((update_policy == UDP_TIMES) ||
((update_demandpolicy == UDDEM_TMCHECK) && opt_DEMANDUPDATE)) {
(update_demandpolicy == UDDEM_TMCHECK)) {
if (*update_times != 0)
pr("The update schedule is: %s\n", update_times);
}
if (opt_DEMANDUPDATE) {
if (update_demandpolicy != UDDEM_DISABLE) {
if (*update_demandtimes != 0)
pr("Demand updates are allowed during: %s\n",
update_demandtimes);
pr("Demand updates require %d country(s) to want one.\n",
update_wantmin);
}
if (update_demandpolicy != UDDEM_DISABLE) {
if (*update_demandtimes != 0)
pr("Demand updates are allowed during: %s\n",
update_demandtimes);
pr("Demand updates require %d country(s) to want one.\n",
update_wantmin);
}
if (*game_days != 0)
pr("Game days are: %s\n", game_days);
if (*game_hours != 0)

3
src/lib/commands/zdon.c
View file

@ -54,6 +54,7 @@
#include "commands.h"
#include "optlist.h"
#include "server.h"
#include "wantupd.h"
int
zdon(void)
@ -70,7 +71,7 @@ zdon(void)
int dowant;
char buf[1024];
if (!opt_DEMANDUPDATE) {
if (update_demandpolicy != UDDEM_DISABLE) {
pr("Demand updates are not enabled.\n");
return RET_FAIL;
}