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

(opt_UPDATESCHED): Remove nooption UPDATESCHED. It had no effect on

Browse source 
the actual update, only on the update command.  Believed to be broken
since Empire2.
This commit is contained in:
Markus Armbruster 2005-12-29 13:38:57 +00:00
parent fb768e844c
commit 1969a3890a
4 changed files with 76 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/econfig-spec.h
View file

@ -177,8 +177,6 @@ EMPCF_OPT("TRADESHIPS", opt_TRADESHIPS,
"Enable Tradeships") "Enable Tradeships")
EMPCF_OPT("TREATIES", opt_TREATIES, EMPCF_OPT("TREATIES", opt_TREATIES,
"Allow treaties") "Allow treaties")
EMPCF_OPT("UPDATESCHED", opt_UPDATESCHED,
"Used to control update times and should always be used")
EMPCF_COMMENT("\n\n### Countries") EMPCF_COMMENT("\n\n### Countries")
EMPCFBOTH("btu_build_rate", btu_build_rate, float, NSC_FLOAT, 0, EMPCFBOTH("btu_build_rate", btu_build_rate, float, NSC_FLOAT, 0,

1
info/Options.t
View file

@ -8,7 +8,6 @@ SHOWPLANE: planes/units on ships/units up for trade are shown
PINPOINT(etc): Missile exist which target ships instead of sectors PINPOINT(etc): Missile exist which target ships instead of sectors
SAIL: another way to automatically move ships (may also be buggy) SAIL: another way to automatically move ships (may also be buggy)
DEMANDUPDATE: updates may be allowed on player demand DEMANDUPDATE: updates may be allowed on player demand
UPDATESCHED: updates can be controlled by the 'hours' file. NITP
The following options were introduced in the Chainsaw server: The following options were introduced in the Chainsaw server:

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

@ -52,6 +52,7 @@ upda(void)
{ {
FILE *fp; FILE *fp;
struct mob_acc_globals timestamps; struct mob_acc_globals timestamps;
time_t now, next, delta;
if (opt_MOB_ACCESS) { if (opt_MOB_ACCESS) {
if ((fp = fopen(timestampfil, "rb")) == NULL) if ((fp = fopen(timestampfil, "rb")) == NULL)
@ -69,103 +70,82 @@ upda(void)
} }
} }
} }
if (opt_UPDATESCHED) {
time_t now, next, delta;
if (updates_disabled()) if (updates_disabled())
pr("UPDATES ARE DISABLED!\n"); pr("UPDATES ARE DISABLED!\n");
(void)time(&now); (void)time(&now);
switch (update_policy) { switch (update_policy) {
case UDP_NORMAL: case UDP_NORMAL:
next_update_time(&now, &next, &delta); next_update_time(&now, &next, &delta);
pr("\nUpdates occur at times specified by the ETU rates.\n\n"); pr("\nUpdates occur at times specified by the ETU rates.\n\n");
pr("The next update is at %19.19s.\n", ctime(&next)); pr("The next update is at %19.19s.\n", ctime(&next));
break; break;
case UDP_TIMES: case UDP_TIMES:
next_update_time(&now, &next, &delta); next_update_time(&now, &next, &delta);
pr("\nUpdates occur at scheduled times.\n\n"); pr("\nUpdates occur at scheduled times.\n\n");
pr("The next update is at %19.19s.\n", ctime(&next)); pr("The next update is at %19.19s.\n", ctime(&next));
break; break;
case UDP_BLITZ: case UDP_BLITZ:
next_update_time(&now, &next, &delta); next_update_time(&now, &next, &delta);
pr("\nBlitz Updates occur every %d minutes. \n\n", blitz_time); pr("\nBlitz Updates occur every %d minutes. \n\n", blitz_time);
pr("The next update is at %19.19s.\n", ctime(&next)); pr("The next update is at %19.19s.\n", ctime(&next));
break; break;
case UDP_NOREG: case UDP_NOREG:
pr("There are no regularly scheduled updates.\n"); pr("There are no regularly scheduled updates.\n");
break; break;
default: default:
pr("Update policy is inconsistent.\n"); pr("Update policy is inconsistent.\n");
}
pr("The current time is %19.19s.\n\n", ctime(&now));
if (update_window) {
now = update_time - update_window;
next_update_time(&now, &next, &delta);
pr("The next update window starts at %19.19s.\n",
ctime(&next));
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");
}
}
}
if ((update_policy == UDP_TIMES) ||
((update_demandpolicy == UDDEM_TMCHECK) && opt_DEMANDUPDATE)) {
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);
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);
}
}
}
if (*game_days != 0)
pr("Game days are: %s\n", game_days);
if (*game_hours != 0)
pr("Game hours are: %s\n", game_hours);
return 0;
} else {
time_t now;
time_t upd_time;
time_t next_update;
int secs_per_update;
int delta;
(void)time(&now);
upd_time = now + adj_update;
secs_per_update = etu_per_update * s_p_etu;
delta = secs_per_update - (upd_time % secs_per_update);
next_update = now + delta;
pr("The next update is at %19.19s.\n", ctime(&next_update));
pr("The current time is %19.19s.\n", ctime(&now));
if (update_window) {
pr("Update times are variable, update window is +/- %d minutes %d seconds.\n", update_window / 60, update_window % 60);
}
return 0;
} }
pr("The current time is %19.19s.\n\n", ctime(&now));
if (update_window) {
now = update_time - update_window;
next_update_time(&now, &next, &delta);
pr("The next update window starts at %19.19s.\n",
ctime(&next));
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");
}
}
}
if ((update_policy == UDP_TIMES) ||
((update_demandpolicy == UDDEM_TMCHECK) && opt_DEMANDUPDATE)) {
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);
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);
}
}
}
if (*game_days != 0)
pr("Game days are: %s\n", game_days);
if (*game_hours != 0)
pr("Game hours are: %s\n", game_hours);
return 0;
} }

1
src/lib/global/options.c
View file

@ -69,4 +69,3 @@ int opt_SUPER_BARS = 0;
int opt_TECH_POP = 0; int opt_TECH_POP = 0;
int opt_TRADESHIPS = 0; int opt_TRADESHIPS = 0;
int opt_TREATIES = 1; int opt_TREATIES = 1;
int opt_UPDATESCHED = 1;