From 9886f76d627e67f0e5ec79fd8a7f2b839233fa78 Mon Sep 17 00:00:00 2001 From: Hourier Date: Sun, 26 Jan 2020 22:02:50 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20CHECK=5FTIME=E3=81=AE?= =?utf8?q?=E3=83=97=E3=83=AA=E3=83=97=E3=83=AD=E3=82=92=E5=89=8A=E9=99=A4?= =?utf8?q?=20/=20Removed=20preprocessor=20CHECK=5FTIME?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/files.c | 104 --------------------------------------------------------- src/files.h | 2 -- src/h-config.h | 6 ---- src/main.c | 6 ---- 4 files changed, 118 deletions(-) diff --git a/src/files.c b/src/files.c index 497534d25..50fb15375 100644 --- a/src/files.c +++ b/src/files.c @@ -1254,110 +1254,6 @@ errr process_pref_file(player_type *creature_ptr, concptr name) } -#ifdef CHECK_TIME - -/* - * Operating hours for ANGBAND (defaults to non-work hours) - */ -static char days[7][29] = -{ - "SUN:XXXXXXXXXXXXXXXXXXXXXXXX", - "MON:XXXXXXXX.........XXXXXXX", - "TUE:XXXXXXXX.........XXXXXXX", - "WED:XXXXXXXX.........XXXXXXX", - "THU:XXXXXXXX.........XXXXXXX", - "FRI:XXXXXXXX.........XXXXXXX", - "SAT:XXXXXXXXXXXXXXXXXXXXXXXX" -}; - -/* - * Restict usage (defaults to no restrictions) - */ -static bool check_time_flag = FALSE; - -#endif - - -/*! - * @brief Angbandプレイ禁止時刻をチェック / - * Handle CHECK_TIME - * @return エラーコード - */ -errr check_time(void) -{ - -#ifdef CHECK_TIME - - time_t c; - struct tm *tp; - - /* No restrictions */ - if (!check_time_flag) return 0; - - /* Check for time violation */ - c = time((time_t *)0); - tp = localtime(&c); - - /* Violation */ - if (days[tp->tm_wday][tp->tm_hour + 4] != 'X') return 1; - -#endif - - /* Success */ - return 0; -} - - -/*! - * @brief Angbandプレイ禁止時刻の初期化 / - * Initialize CHECK_TIME - * @return エラーコード - */ -errr check_time_init(void) -{ - -#ifdef CHECK_TIME - - FILE *fp; - - char buf[1024]; - - path_build(buf, sizeof(buf), ANGBAND_DIR_FILE, "time.txt"); - fp = my_fopen(buf, "r"); - - /* No file, no restrictions */ - if (!fp) return 0; - - /* Assume restrictions */ - check_time_flag = TRUE; - - /* Parse the file */ - while (0 == my_fgets(fp, buf, sizeof(buf))) - { - /* Skip comments and blank lines */ - if (!buf[0] || (buf[0] == '#')) continue; - - /* Chop the buffer */ - buf[29] = '\0'; - - /* Extract the info */ - if (prefix(buf, "SUN:")) strcpy(days[0], buf); - if (prefix(buf, "MON:")) strcpy(days[1], buf); - if (prefix(buf, "TUE:")) strcpy(days[2], buf); - if (prefix(buf, "WED:")) strcpy(days[3], buf); - if (prefix(buf, "THU:")) strcpy(days[4], buf); - if (prefix(buf, "FRI:")) strcpy(days[5], buf); - if (prefix(buf, "SAT:")) strcpy(days[6], buf); - } - my_fclose(fp); - -#endif - - /* Success */ - return 0; -} - - #ifdef CHECK_LOAD #ifndef MAXHOSTNAMELEN diff --git a/src/files.h b/src/files.h index 1a7d32792..a0cb486fb 100644 --- a/src/files.h +++ b/src/files.h @@ -34,9 +34,7 @@ extern errr process_pref_file(player_type *creature_ptr, concptr name); extern errr process_autopick_file(player_type *creature_ptr, concptr name); extern errr process_histpref_file(player_type *creature_ptr, concptr name); extern void display_player_equippy(player_type *player_ptr, TERM_LEN y, TERM_LEN x, BIT_FLAGS16 mode); -extern errr check_time_init(void); extern errr check_load_init(void); -extern errr check_time(void); extern errr check_load(void); extern bool show_file(player_type *player_ptr, bool show_version, concptr name, concptr what, int line, BIT_FLAGS mode); extern void do_cmd_help(player_type *creature_ptr); diff --git a/src/h-config.h b/src/h-config.h index 526314afb..ceeccef03 100644 --- a/src/h-config.h +++ b/src/h-config.h @@ -415,12 +415,6 @@ # define SAVEFILE_USE_UID #endif - -/* - * OPTION: Check the "time" against "lib/file/hours.txt" - */ -/* #define CHECK_TIME */ - /* * OPTION: Check the "load" against "lib/file/load.txt" * This may require the 'rpcsvs' library diff --git a/src/main.c b/src/main.c index 0459da514..adc75559d 100644 --- a/src/main.c +++ b/src/main.c @@ -338,12 +338,6 @@ int main(int argc, char *argv[]) #ifdef SET_UID - /* Initialize the "time" checker */ - if (check_time_init() || check_time()) - { - quit("The gates to Angband are closed (bad time)."); - } - /* Initialize the "load" checker */ if (check_load_init() || check_load()) { -- 2.11.0