From: deskull Date: Thu, 16 May 2019 14:44:45 +0000 (+0900) Subject: [Refactor] #37353 signal_count を files.c/h へ移動. X-Git-Url: http://git.osdn.net/view?p=hengband%2Fhengband.git;a=commitdiff_plain;h=c6e58e504a94102fce274638abdc46d2900c5ff8 [Refactor] #37353 signal_count を files.c/h へ移動. --- diff --git a/src/externs.h b/src/externs.h index 4265c0c51..61d74d1cd 100644 --- a/src/externs.h +++ b/src/externs.h @@ -55,8 +55,6 @@ extern s16b command_wrk; extern s16b command_new; extern bool msg_flag; -extern s16b signal_count; - extern bool get_com_no_macros; extern bool repair_monsters; diff --git a/src/files.c b/src/files.c index 6468b7476..4351ddb54 100644 --- a/src/files.c +++ b/src/files.c @@ -78,6 +78,9 @@ concptr ANGBAND_DIR_SAVE; //!< Savefiles for current characters (binary) concptr ANGBAND_DIR_USER; //!< User "preference" files (ascii) These files are rarely portable between platforms concptr ANGBAND_DIR_XTRA; //!< Various extra files (binary) These files are rarely portable between platforms +s16b signal_count; /* Hack -- Count interupts */ + + /* * You may or may not want to use the following "#undef". */ diff --git a/src/files.h b/src/files.h index 9e2d5a303..ca2efe941 100644 --- a/src/files.h +++ b/src/files.h @@ -14,6 +14,8 @@ extern concptr ANGBAND_DIR_SAVE; extern concptr ANGBAND_DIR_USER; extern concptr ANGBAND_DIR_XTRA; +extern s16b signal_count; + /* files.c */ extern void safe_setuid_drop(void); extern void safe_setuid_grab(void); diff --git a/src/util.c b/src/util.c index ac0cfeba0..392f5053b 100644 --- a/src/util.c +++ b/src/util.c @@ -12,6 +12,7 @@ #include "angband.h" #include "util.h" +#include "files.h" #include "monsterrace-hook.h" #include "view-mainwindow.h" #include "quest.h" diff --git a/src/variable.c b/src/variable.c index edc86eef6..35f372018 100644 --- a/src/variable.c +++ b/src/variable.c @@ -28,8 +28,6 @@ s16b command_new; /* Command chaining from inven/equip view */ bool msg_flag; /* Used in msg_print() for "buffering" */ -s16b signal_count; /* Hack -- Count interupts */ - bool get_com_no_macros = FALSE; /* Expand macros in "get_com" or not */ bool repair_monsters; /* Hack -- optimize detect monsters */