diff --git a/include/econfig-spec.h b/include/econfig-spec.h index 4c5e97a1..643c0d5b 100644 --- a/include/econfig-spec.h +++ b/include/econfig-spec.h @@ -177,8 +177,6 @@ EMPCF_OPT("TRADESHIPS", opt_TRADESHIPS, "Enable Tradeships") EMPCF_OPT("TREATIES", opt_TREATIES, "Allow treaties") -EMPCF_OPT("UPDATESCHED", opt_UPDATESCHED, - "Used to control update times and should always be used") EMPCF_COMMENT("\n\n### Countries") EMPCFBOTH("btu_build_rate", btu_build_rate, float, NSC_FLOAT, 0, diff --git a/info/Options.t b/info/Options.t index 273037e2..d05e6b73 100644 --- a/info/Options.t +++ b/info/Options.t @@ -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 SAIL: another way to automatically move ships (may also be buggy) 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: diff --git a/src/lib/commands/upda.c b/src/lib/commands/upda.c index 758304c5..3faa256d 100644 --- a/src/lib/commands/upda.c +++ b/src/lib/commands/upda.c @@ -52,6 +52,7 @@ upda(void) { FILE *fp; struct mob_acc_globals timestamps; + time_t now, next, delta; if (opt_MOB_ACCESS) { if ((fp = fopen(timestampfil, "rb")) == NULL) @@ -69,103 +70,82 @@ upda(void) } } } - if (opt_UPDATESCHED) { - time_t now, next, delta; - if (updates_disabled()) - pr("UPDATES ARE DISABLED!\n"); + if (updates_disabled()) + pr("UPDATES ARE DISABLED!\n"); - (void)time(&now); - switch (update_policy) { - case UDP_NORMAL: - next_update_time(&now, &next, &delta); - pr("\nUpdates occur at times specified by the ETU rates.\n\n"); - pr("The next update is at %19.19s.\n", ctime(&next)); - break; - case UDP_TIMES: - next_update_time(&now, &next, &delta); - pr("\nUpdates occur at scheduled times.\n\n"); - pr("The next update is at %19.19s.\n", ctime(&next)); - break; - case UDP_BLITZ: - next_update_time(&now, &next, &delta); - pr("\nBlitz Updates occur every %d minutes. \n\n", blitz_time); - pr("The next update is at %19.19s.\n", ctime(&next)); - break; - case UDP_NOREG: - pr("There are no regularly scheduled updates.\n"); - break; - default: - 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; + (void)time(&now); + switch (update_policy) { + case UDP_NORMAL: + next_update_time(&now, &next, &delta); + pr("\nUpdates occur at times specified by the ETU rates.\n\n"); + pr("The next update is at %19.19s.\n", ctime(&next)); + break; + case UDP_TIMES: + next_update_time(&now, &next, &delta); + pr("\nUpdates occur at scheduled times.\n\n"); + pr("The next update is at %19.19s.\n", ctime(&next)); + break; + case UDP_BLITZ: + next_update_time(&now, &next, &delta); + pr("\nBlitz Updates occur every %d minutes. \n\n", blitz_time); + pr("The next update is at %19.19s.\n", ctime(&next)); + break; + case UDP_NOREG: + pr("There are no regularly scheduled updates.\n"); + break; + default: + 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; } diff --git a/src/lib/global/options.c b/src/lib/global/options.c index d738efe6..3faf7dba 100644 --- a/src/lib/global/options.c +++ b/src/lib/global/options.c @@ -69,4 +69,3 @@ int opt_SUPER_BARS = 0; int opt_TECH_POP = 0; int opt_TRADESHIPS = 0; int opt_TREATIES = 1; -int opt_UPDATESCHED = 1;